diff --git a/MyLittleRimPony/About/About.xml b/MyLittleRimPony/About/About.xml index d591a54f..323db5ed 100644 --- a/MyLittleRimPony/About/About.xml +++ b/MyLittleRimPony/About/About.xml @@ -3,7 +3,7 @@ GeodesicDragon geodesicdragon.rimpony https://discord.gg/BGKnpza - 6.0.0 + 6.5.23
  • 1.5
  • diff --git a/MyLittleRimPony/About/Changelog.txt b/MyLittleRimPony/About/Changelog.txt index 3a6b528e..8ae663f3 100644 --- a/MyLittleRimPony/About/Changelog.txt +++ b/MyLittleRimPony/About/Changelog.txt @@ -1,3 +1,37 @@ +Version 6.5.23 (October 11th 2024) + +* Higher Power: Added a patch which will increase the power output of Screwballs by an additional 10% once advanced power is researched. +* Combat Extended: Added a recipe to the Nightmare Moon statue which lets you request 100 units of FSX in exchange for 1130 silver. +* Combat Extended: Added a recipe to the Nightmare Moon statue which lets you request 100 units of prometheum in exchange for 900 silver. +* Vanilla Backstories Expanded: Added French localisation. +* XML Extensions: Added the ability to configure how many materials are given when recycling destroyed plushies. + * Minimum: 75 + * Maximum: 150 + * Default: 75 +* Core: Fixed some C# keys not being localised into German properly. +* Core: Plushie traders now carry up to 3 ruined plushies. +* Core: Ruined plushies are now flammable. +* Core: Researching the ability to request archotech items from Nightmare Moon now requires you to have researched bionic replacements first. +* Core: Fixed duplicate word in fanfiction quality description. +* Core: The texture for the Daybreaker statue now remains the same regardless of which direction it is rotated. +* Core: The texture for the Nightmare Moon statue now remains the same regardless of which direction it is rotated. +* Core: The texture for the Fabric Exchange now remains the same regardless of which direction it is rotated. +* Core: The texture for the Stone Exchange now remains the same regardless of which direction it is rotated. +* Biotech: Fixed ruined plushies not being dropped by Diamond Dogs. +* Biotech: Ruined plushies are now exclusively dropped by Diamond Dogs. +* Biotech: Diamond Dogs no longer drop jade, plasteel, steel and uranium. +* Combat Extended: Fixed Sweetie Bot turrets not firing properly. +* Combat Extended: Fixed a rare bug which would prevent you from building or reinstalling Sweetie Bot turrets. +* Combat Extended: Fixed missing ammo in the Brony Community scenario. +* Combat Extended: Patched the request antigrain warhead recipe at the Nightmare Moon statue to use mod-relevant terminology. +* Combat Extended: Increased the amount of blunt/sharp/heat protection provided by the Shining Armour plushie to 5/5/0.3 (was 1/1/0.15). +* Combat Extended: The Shining Armour plushie now provides protection to the torso as well as the waist. +* Combat Extended: Fixed wooden bullets showing as not being patched. They have a base damage of 1, and a sharp AP rating of 3. +* Combat Extended/Biotech: Increased the amount of blunt/sharp/heat protection provided by the child Shining Armour plushie to 10/10/0.6 (was 2/2/0.3). +* Combat Extended/Biotech: The child Shining Armour plushie now provides protection to the torso as well as the waist. +* Combat Extended/Biotech: Fixed missing ammo in the Brony Xenotypes scenario. +* Vanilla Factions Expanded - Deserters: Reduced the amount of standard intel given by the request intel recipe to 10 (was 25). The cost is unchanged. + Version 6.0.0 (August 31st 2024) * Added French localisation. Ajout de la localisation en français. diff --git a/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_DiamondDogs.xml b/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_DiamondDogs.xml index 4c2cb60b..0b9088b4 100644 --- a/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_DiamondDogs.xml +++ b/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_DiamondDogs.xml @@ -112,22 +112,27 @@ - - MLRP_DiamondDogLoot - - - - -
  • Gold
  • -
  • Jade
  • -
  • Plasteel
  • -
  • Silver
  • -
  • Steel
  • -
  • Uranium
  • -
  • PonyPlush_Ruined
  • -
    -
    -
    -
    -
    + + MLRP_DiamondDogLoot + + + + 3 + 10 + + + 250 + 1000 + + + +
  • PonyPlush_Ruined
  • +
  • Gold
  • +
  • Silver
  • +
    +
    +
    +
    +
    + \ No newline at end of file diff --git a/MyLittleRimPony/Biotech/Defs/ThingDef_PonyPlush/PonyPlush_ShiningArmour_Child.xml b/MyLittleRimPony/Biotech/Defs/ThingDef_PonyPlush/PonyPlush_ShiningArmour_Child.xml index 32064b5c..1e50492f 100644 --- a/MyLittleRimPony/Biotech/Defs/ThingDef_PonyPlush/PonyPlush_ShiningArmour_Child.xml +++ b/MyLittleRimPony/Biotech/Defs/ThingDef_PonyPlush/PonyPlush_ShiningArmour_Child.xml @@ -12,5 +12,10 @@ 0.3 0.3 + + +
  • Waist
  • +
    +
    \ No newline at end of file diff --git a/MyLittleRimPony/Biotech/Languages/French/DefInjected/ThoughtDefs/MLRP_BiotechThoughts_FR.xml b/MyLittleRimPony/Biotech/Languages/French/DefInjected/ThoughtDefs/MLRP_BiotechThoughts_FR.xml index 275bad72..c35487c0 100644 --- a/MyLittleRimPony/Biotech/Languages/French/DefInjected/ThoughtDefs/MLRP_BiotechThoughts_FR.xml +++ b/MyLittleRimPony/Biotech/Languages/French/DefInjected/ThoughtDefs/MLRP_BiotechThoughts_FR.xml @@ -22,7 +22,7 @@ compagnon xénotype du poney - peluche de Izzy Moonbow + peluche de Izzy Moonbow Son sourire est vraiment joli! diff --git a/MyLittleRimPony/Combat Extended/Defs/RecipeDefs/NightmareMoon_Offerings_CE.xml b/MyLittleRimPony/Combat Extended/Defs/RecipeDefs/NightmareMoon_Offerings_CE.xml new file mode 100644 index 00000000..6c9868aa --- /dev/null +++ b/MyLittleRimPony/Combat Extended/Defs/RecipeDefs/NightmareMoon_Offerings_CE.xml @@ -0,0 +1,65 @@ + + + + + + MLRP_NMM_CE_FSX + + Offer silver in exchange for 100 units of FSX. + Making an offering to Nightmare Moon + GeneralLaborSpeed + Crafting + Cremate + Recipe_Cremate + false + 300 + +
  • MLRP_NightmareMoon
  • +
    + +
  • + + +
  • Silver
  • + + + 113 + +
    + + 100 + +
    + + + + + MLRP_NMM_CE_Prometheum + + Offer silver in exchange for 100 units of prometheum. + Making an offering to Nightmare Moon + GeneralLaborSpeed + Crafting + Cremate + Recipe_Cremate + false + 300 + +
  • MLRP_NightmareMoon
  • +
    + +
  • + + +
  • Silver
  • + + + 90 + +
    + + 100 + +
    + +
    \ No newline at end of file diff --git a/MyLittleRimPony/Combat Extended/Defs/ResearchProjectDefs/MLRP_ResearchCE.xml b/MyLittleRimPony/Combat Extended/Defs/ResearchProjectDefs/MLRP_ResearchCE.xml index 172afc4a..c9ac55dd 100644 --- a/MyLittleRimPony/Combat Extended/Defs/ResearchProjectDefs/MLRP_ResearchCE.xml +++ b/MyLittleRimPony/Combat Extended/Defs/ResearchProjectDefs/MLRP_ResearchCE.xml @@ -7,8 +7,8 @@ Unlocks the ability to craft pony-themed ammunition. MLRP_ResearchTab - 4 - 0 + 0 + 5 \ No newline at end of file diff --git a/MyLittleRimPony/Combat Extended/Patches/AggroTurret_Patches.xml b/MyLittleRimPony/Combat Extended/Patches/AggroTurret_Patches.xml index 49e05985..ccddadda 100644 --- a/MyLittleRimPony/Combat Extended/Patches/AggroTurret_Patches.xml +++ b/MyLittleRimPony/Combat Extended/Patches/AggroTurret_Patches.xml @@ -1,5 +1,27 @@ + + + + /Defs/ThingDef[@Name="MLRP_WeaponisedArrogance"] + + CombatExtended.BulletCE + + + + + /Defs/ThingDef[defName="MLRP_WeaponisedArrogance"]/projectile + + + 1 + 3 + 1 + + + + + + Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze"]/thingClass diff --git a/MyLittleRimPony/Combat Extended/Patches/BronyCommunityScenarioPatch.xml b/MyLittleRimPony/Combat Extended/Patches/BronyCommunityScenarioPatch.xml index 8536a020..698c6df8 100644 --- a/MyLittleRimPony/Combat Extended/Patches/BronyCommunityScenarioPatch.xml +++ b/MyLittleRimPony/Combat Extended/Patches/BronyCommunityScenarioPatch.xml @@ -1,5 +1,3 @@ - - /Defs/ScenarioDef[defName="MLRP_Scenario"]/scenario/parts @@ -9,6 +7,12 @@ Ammo_556x45mmNATO_FMJ 300 + +
  • + StartingThing_Defined + Bullet_45ACP_FMJ + 70 +
  • \ No newline at end of file diff --git a/MyLittleRimPony/Combat Extended/Patches/BronyXenotypesScenarioPatch.xml b/MyLittleRimPony/Combat Extended/Patches/BronyXenotypesScenarioPatch.xml index 2bfc6b69..d8b60d64 100644 --- a/MyLittleRimPony/Combat Extended/Patches/BronyXenotypesScenarioPatch.xml +++ b/MyLittleRimPony/Combat Extended/Patches/BronyXenotypesScenarioPatch.xml @@ -1,5 +1,3 @@ - - /Defs/ScenarioDef[defName="MLRP_Scenario_Xenos"]/scenario/parts @@ -9,6 +7,12 @@ Ammo_556x45mmNATO_FMJ 300 + +
  • + StartingThing_Defined + Bullet_45ACP_FMJ + 105 +
  • \ No newline at end of file diff --git a/MyLittleRimPony/Combat Extended/Patches/CompositeHelmetPatches.xml b/MyLittleRimPony/Combat Extended/Patches/CompositeHelmetPatches.xml index f8879cf6..f2fa8212 100644 --- a/MyLittleRimPony/Combat Extended/Patches/CompositeHelmetPatches.xml +++ b/MyLittleRimPony/Combat Extended/Patches/CompositeHelmetPatches.xml @@ -1,5 +1,6 @@ + Defs/ScenarioDef[defName="MLRP_Scenario"]/scenario/parts/li[@Name="MLRP_CoreScenario_Helmets"] @@ -11,6 +12,7 @@ + Defs/ScenarioDef[defName="MLRP_Scenario_Xenos"]/scenario/parts/li[@Name="MLRP_BiotechScenario_Helmets"] diff --git a/MyLittleRimPony/Combat Extended/Patches/HerbalCureKitPatch.xml b/MyLittleRimPony/Combat Extended/Patches/HerbalCureKitPatch.xml new file mode 100644 index 00000000..8104d6f4 --- /dev/null +++ b/MyLittleRimPony/Combat Extended/Patches/HerbalCureKitPatch.xml @@ -0,0 +1,10 @@ + + + + /Defs/ThingDef[defName="MLRP_PoisonJokeAddictionCureKit"]/statBases + + 0.1 + + + + \ No newline at end of file diff --git a/MyLittleRimPony/Combat Extended/Patches/PlushiePatch.xml b/MyLittleRimPony/Combat Extended/Patches/PlushiePatch.xml index 57980ae6..b2079b30 100644 --- a/MyLittleRimPony/Combat Extended/Patches/PlushiePatch.xml +++ b/MyLittleRimPony/Combat Extended/Patches/PlushiePatch.xml @@ -10,6 +10,13 @@ + + /Defs/ThingDef[defName="PonyPlush_Ruined"]/statBases + + 0.1 + + + @@ -52,28 +59,42 @@ /Defs/ThingDef[defName="PonyPlush_ShiningArmour"]/statBases - 1 - 1 - 0.15 + 5 + 5 + 0.3 + + /Defs/ThingDef[defName="PonyPlush_ShiningArmour"]/apparel/bodyPartGroups + +
  • Torso
  • +
    +
    + /Defs/ThingDef[defName="PonyPlush_ShiningArmour_Child"]/statBases - 2 - 2 - 0.3 + 10 + 10 + 0.6 + + /Defs/ThingDef[defName="PonyPlush_ShiningArmour_Child"]/apparel/bodyPartGroups + +
  • Torso
  • +
    +
    + - Defs/ThingDef[defName="PonyPlush_SpoiledRich"]/equippedStatOffsets + /Defs/ThingDef[defName="PonyPlush_SpoiledRich"]/equippedStatOffsets -0.25 @@ -94,21 +115,21 @@ /Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets/ArmorRating_Blunt - 1 + 5 /Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets/ArmorRating_Sharp - 1 + 5 /Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets/ArmorRating_Heat - 0.15 + 0.3 diff --git a/MyLittleRimPony/Combat Extended/Patches/RequestAntigrainWarheadRecipePatch.xml b/MyLittleRimPony/Combat Extended/Patches/RequestAntigrainWarheadRecipePatch.xml new file mode 100644 index 00000000..1dd50137 --- /dev/null +++ b/MyLittleRimPony/Combat Extended/Patches/RequestAntigrainWarheadRecipePatch.xml @@ -0,0 +1,17 @@ + + + + Defs/RecipeDef[defName="MLRP_NMM_AntigrainWarhead"]/label + + + + + + + Defs/RecipeDef[defName="MLRP_NMM_AntigrainWarhead"]/description + + Offer silver and a large quantity of high explosive shells in exchange for a single 81mm mortar shell (Anti). + + + + \ No newline at end of file diff --git a/MyLittleRimPony/Combat Extended/Patches/SweetieBot_Patch.xml b/MyLittleRimPony/Combat Extended/Patches/SweetieBot_Patch.xml index 2f37c0d8..a23d021f 100644 --- a/MyLittleRimPony/Combat Extended/Patches/SweetieBot_Patch.xml +++ b/MyLittleRimPony/Combat Extended/Patches/SweetieBot_Patch.xml @@ -38,7 +38,7 @@ 0 40 3 - 3 + 4 MLRP_EOH_Fire GunTail_Light 9 @@ -55,4 +55,31 @@ true + + + Defs/ThingDef[defName="MLRP_SweetieBotTurret"]/verbs + + +
  • + 1.5 + CombatExtended.Verb_ShootCE + false + true + false + Projectile_HarmonyRainbow + 0 + 46 + 3 + 30 + MLRP_EOH_Fire + GunTail_Light + 9 + + false + + 1 +
  • +
    +
    +
    \ No newline at end of file diff --git a/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll b/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll index f990e6ee..b323498f 100644 Binary files a/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll and b/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll differ diff --git a/MyLittleRimPony/Core/Defs/MLRP_Sounds.xml b/MyLittleRimPony/Core/Defs/MLRP_Sounds.xml index 5b30d2f0..85fa0eb4 100644 --- a/MyLittleRimPony/Core/Defs/MLRP_Sounds.xml +++ b/MyLittleRimPony/Core/Defs/MLRP_Sounds.xml @@ -29,7 +29,7 @@ PrioritizeNearest
  • - True + False True
  • @@ -37,6 +37,8 @@
  • 100 + 10~100 + 1
    diff --git a/MyLittleRimPony/Core/Defs/RecipeDefs/PlushieRecycling.xml b/MyLittleRimPony/Core/Defs/RecipeDefs/PlushieRecycling.xml index a7c2fafd..cb0a6554 100644 --- a/MyLittleRimPony/Core/Defs/RecipeDefs/PlushieRecycling.xml +++ b/MyLittleRimPony/Core/Defs/RecipeDefs/PlushieRecycling.xml @@ -32,6 +32,11 @@
  • Pony_Plushie_Ruined
  • + +
  • + 75 +
  • +
    \ No newline at end of file diff --git a/MyLittleRimPony/Core/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml b/MyLittleRimPony/Core/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml index 4804bc4b..7029b870 100644 --- a/MyLittleRimPony/Core/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml +++ b/MyLittleRimPony/Core/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml @@ -115,6 +115,9 @@ MLRP_ArchotechResearch Nightmare Moon will allow you to request archotech items from her. + +
  • Bionics
  • +
    MLRP_ResearchTab 8 0 diff --git a/MyLittleRimPony/Core/Defs/RulePackDefs/RulePacks_NameMakers_Fanfiction.xml b/MyLittleRimPony/Core/Defs/RulePackDefs/RulePacks_NameMakers_Fanfiction.xml index 97006296..0faaa6ae 100644 --- a/MyLittleRimPony/Core/Defs/RulePackDefs/RulePacks_NameMakers_Fanfiction.xml +++ b/MyLittleRimPony/Core/Defs/RulePackDefs/RulePacks_NameMakers_Fanfiction.xml @@ -27,7 +27,7 @@ Description_MLP_Fanfiction -
  • desc->This work of pony fanfiction was written over three thousand years ago ago[book_quality]
  • +
  • desc->This work of pony fanfiction was written over three thousand years ago[book_quality]
  • book_quality(quality[greater_than]5)->, and is in superior condition for its age.
  • book_quality(quality[less_than]2)->, and is barely readable due to extensive damage.
  • diff --git a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/AggroTurret_MiscDefs.xml b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/AggroTurret_MiscDefs.xml index f785094a..b2f20aa2 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/AggroTurret_MiscDefs.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/AggroTurret_MiscDefs.xml @@ -45,7 +45,7 @@ MLRP_WeaponisedArrogance - + Things/PonyPlush/PlushEquipped Graphic_Single diff --git a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/Daybreaker.xml b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/Daybreaker.xml index 00362c43..da513c92 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/Daybreaker.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/Daybreaker.xml @@ -8,7 +8,7 @@ Misc8 Things/Building/Daybreaker - Graphic_Single + Graphic_Multi (2,2) MinifiedThing diff --git a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MarblePie.xml b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MarblePie.xml index a98ca96c..6c9db195 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MarblePie.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MarblePie.xml @@ -8,7 +8,7 @@ Things/Building/MarblePie - Graphic_Single + Graphic_Multi (1,1) MinifiedThing diff --git a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MissPommel.xml b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MissPommel.xml index f94a77a7..4aab3ee5 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MissPommel.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MissPommel.xml @@ -8,7 +8,7 @@ Things/Building/MissPommel - Graphic_Single + Graphic_Multi (1,1) MinifiedThing diff --git a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/NightmareMoon.xml b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/NightmareMoon.xml index 2b4db01b..305b9a25 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/NightmareMoon.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/NightmareMoon.xml @@ -8,7 +8,7 @@ Misc4 Things/Building/NightmareMoon - Graphic_Single + Graphic_Multi (2,2) MinifiedThing diff --git a/MyLittleRimPony/Core/Defs/ThingDef_Items/PonyPlush_RuinedPlushie.xml b/MyLittleRimPony/Core/Defs/ThingDef_Items/PonyPlush_RuinedPlushie.xml index 47bd8f88..92fa9e1b 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_Items/PonyPlush_RuinedPlushie.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_Items/PonyPlush_RuinedPlushie.xml @@ -3,6 +3,7 @@ PonyPlush_Ruined + ThingWithComps This plushie has somehow been destroyed, and is truly a sad sight to behold.\n\nIt can be recycled at the plushie bench to recover some useful materials. Things/PonyPlush/Ruined @@ -12,13 +13,15 @@ Middle Standard_Drop Standard_Drop + true 10 100 0.08 + 300 + 1 false - true 300
  • Fabric
  • @@ -27,6 +30,9 @@
  • Pony_Plushie_Ruined
  • + +
  • MLRP_Ruined_Plushie
  • +
    \ No newline at end of file diff --git a/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_ShiningArmour.xml b/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_ShiningArmour.xml index 5cb13b5f..e2e9433b 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_ShiningArmour.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_ShiningArmour.xml @@ -11,5 +11,10 @@ 0.15 0.15 + + +
  • Waist
  • +
    +
    \ No newline at end of file diff --git a/MyLittleRimPony/Core/Defs/ThoughtDefs/ThoughtDefs_Plushies.xml b/MyLittleRimPony/Core/Defs/ThoughtDefs/ThoughtDefs_Plushies.xml index b0564d2b..9184bc08 100644 --- a/MyLittleRimPony/Core/Defs/ThoughtDefs/ThoughtDefs_Plushies.xml +++ b/MyLittleRimPony/Core/Defs/ThoughtDefs/ThoughtDefs_Plushies.xml @@ -34,4 +34,5 @@
  • MLRP_AntiBronyTrait
  • + \ No newline at end of file diff --git a/MyLittleRimPony/Core/Defs/TraderKindDefs/TraderDef_MLRP.xml b/MyLittleRimPony/Core/Defs/TraderKindDefs/TraderDef_MLRP.xml index 7e9be886..599ffabd 100644 --- a/MyLittleRimPony/Core/Defs/TraderKindDefs/TraderDef_MLRP.xml +++ b/MyLittleRimPony/Core/Defs/TraderKindDefs/TraderDef_MLRP.xml @@ -23,6 +23,11 @@ 1~3 +
  • + PonyPlush_Ruined + 1~3 +
  • +
  • Textiles 1~20 diff --git a/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml b/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml index 15ebfcd4..d48c63a9 100644 --- a/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml +++ b/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml @@ -39,9 +39,13 @@ New recipe(s) unlocked New recipe(s) available at the Daybreaker statue. + New recipe(s) available at the plushie bench. New recipe(s) available at the Fabric Exchange. New recipe(s) available at the Stone Exchange. New recipe(s) available at the Nightmare Moon statue. New recipe(s) available from Thingpone. + Advanced power researched + +10% to Screwball power output. + \ No newline at end of file diff --git a/MyLittleRimPony/Core/Languages/French/DefInjected/HediffDefs/Hediffs_FR.xml b/MyLittleRimPony/Core/Languages/French/DefInjected/HediffDefs/Hediffs_FR.xml index c07b64e2..6c72c2ef 100644 --- a/MyLittleRimPony/Core/Languages/French/DefInjected/HediffDefs/Hediffs_FR.xml +++ b/MyLittleRimPony/Core/Languages/French/DefInjected/HediffDefs/Hediffs_FR.xml @@ -12,7 +12,7 @@ Tenir la peluche rend la douleur un peu plus supportable. - + amélioration de la conscience diff --git a/MyLittleRimPony/Core/Languages/French/Keyed/Keys.xml b/MyLittleRimPony/Core/Languages/French/Keyed/Keys.xml index 2487df08..64d220b7 100644 --- a/MyLittleRimPony/Core/Languages/French/Keyed/Keys.xml +++ b/MyLittleRimPony/Core/Languages/French/Keyed/Keys.xml @@ -39,9 +39,12 @@ Nouvelle recette(s) débloquée Nouvelle recette(s) disponible à la statue Daybreaker. + Nouvelle recette(s) disponible à la établi pour peluche de poney. Nouvelle recette(s) disponible à la échange de tissus. Nouvelle recette(s) disponible à la échange de pierres. Nouvelle recette(s) disponible à la statue Nightmare Moon. Nouvelle recette(s) disponible à la Thingpone. + Recherche avancée de puissance + +10% à la puissance de sortie de la boule de vis. \ No newline at end of file diff --git a/MyLittleRimPony/Core/Languages/German/Keyed/Keys.xml b/MyLittleRimPony/Core/Languages/German/Keyed/Keys.xml index 6ee72834..832f8e1d 100644 --- a/MyLittleRimPony/Core/Languages/German/Keyed/Keys.xml +++ b/MyLittleRimPony/Core/Languages/German/Keyed/Keys.xml @@ -36,15 +36,16 @@ Anti Brony hat einen Harmonie-Chip Auf einem Bauern mit der Anti-Brony-Eigenschaft ist ein Harmonie-Chip installiert. Dies führt zu einem Abzug von -10 auf ihre Stimmung, bis dieser entfernt wird. - - - Sweetie Bot Mechanoiden - Sweetie Bot-Mechanoiden bewegen sich schnell und verfügen über eine anständige, scharfe Panzerung, sind aber im Nahkampf verwundbar.\n\nSie eignen sich am besten zum Angriff auf die Flanken eines Feindes, zum Vorstürmen und Legen Feuer ab, bevor sie sich in eine sichere Entfernung zurückziehen.\n\nSie können auch als Reittiere verwendet werden, wenn sie Teil von Karawanen sind. - - - - [My Little RimPony] XML-Erweiterungen wurden erkannt. - [My Little RimPony] Combat Extended wurde erkannt. - [My Little RimPony] Patches für die mittelalterliche Überholung wurden angewendet. + + + Neue(s) Rezept(e) verfügbar + Neue(s) Rezept(e) erhältlich bei der Daybreaker-Statue. + Neue(s) Rezept(e) an der Plüschbank erhältlich. + Neue(s) Rezept(e) in der Stoffbörse erhältlich. + Neue(s) Rezept(e) in der Steinbörse erhältlich. + Neue(s) Rezept(e) bei der Alptraum-Mond-Statue erhältlich. + Neue(s) Rezept(e) von Thingpone verfügbar. + Fortschrittliche Leistung erforscht + +10% auf die Leistung des Screwballs. \ No newline at end of file diff --git a/MyLittleRimPony/Core/Patches/Core/AddRuinedPlushiesToCoreLootTables.xml b/MyLittleRimPony/Core/Patches/Core/AddRuinedPlushiesToCoreLootTables.xml index eef29eb3..9274c872 100644 --- a/MyLittleRimPony/Core/Patches/Core/AddRuinedPlushiesToCoreLootTables.xml +++ b/MyLittleRimPony/Core/Patches/Core/AddRuinedPlushiesToCoreLootTables.xml @@ -1,10 +1,10 @@ - + \ No newline at end of file diff --git a/MyLittleRimPony/Core/Patches/Higher Power/ExtraScrewballOutput.xml b/MyLittleRimPony/Core/Patches/Higher Power/ExtraScrewballOutput.xml new file mode 100644 index 00000000..31e04fa8 --- /dev/null +++ b/MyLittleRimPony/Core/Patches/Higher Power/ExtraScrewballOutput.xml @@ -0,0 +1,18 @@ + + + + +
  • Higher Power
  • + + + Defs/ThingDef[defName="MLRP_ScrewballGenerator"]/comps/li[@Class="CompProperties_Power"]/powerUpgrades + +
  • + HP_AdvancedPower + 1.1 +
  • +
    +
    + + + \ No newline at end of file diff --git a/MyLittleRimPony/Core/Patches/Hooligans/AddRuinedPlushiesToHooliganLootTable.xml b/MyLittleRimPony/Core/Patches/Hooligans/AddRuinedPlushiesToHooliganLootTable.xml index 8f34f907..233ba076 100644 --- a/MyLittleRimPony/Core/Patches/Hooligans/AddRuinedPlushiesToHooliganLootTable.xml +++ b/MyLittleRimPony/Core/Patches/Hooligans/AddRuinedPlushiesToHooliganLootTable.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_east.png b/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_east.png new file mode 100644 index 00000000..15b1664f Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_east.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_north.png b/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_north.png new file mode 100644 index 00000000..15b1664f Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_north.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_south.png b/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_south.png new file mode 100644 index 00000000..15b1664f Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_south.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_west.png b/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_west.png new file mode 100644 index 00000000..15b1664f Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/Daybreaker_west.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_east.png b/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_east.png new file mode 100644 index 00000000..fb6061a4 Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_east.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_north.png b/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_north.png new file mode 100644 index 00000000..fb6061a4 Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_north.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_south.png b/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_south.png new file mode 100644 index 00000000..fb6061a4 Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_south.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_west.png b/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_west.png new file mode 100644 index 00000000..fb6061a4 Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/MarblePie_west.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_east.png b/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_east.png new file mode 100644 index 00000000..85c2158e Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_east.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_north.png b/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_north.png new file mode 100644 index 00000000..85c2158e Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_north.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_south.png b/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_south.png new file mode 100644 index 00000000..85c2158e Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_south.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_west.png b/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_west.png new file mode 100644 index 00000000..85c2158e Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/MissPommel_west.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_east.png b/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_east.png new file mode 100644 index 00000000..8ea358e2 Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_east.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_north.png b/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_north.png new file mode 100644 index 00000000..8ea358e2 Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_north.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_south.png b/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_south.png new file mode 100644 index 00000000..8ea358e2 Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_south.png differ diff --git a/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_west.png b/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_west.png new file mode 100644 index 00000000..8ea358e2 Binary files /dev/null and b/MyLittleRimPony/Core/Textures/Things/Building/NightmareMoon_west.png differ diff --git a/MyLittleRimPony/HugsLib/News/NewMLRPFeatures.xml b/MyLittleRimPony/HugsLib/News/NewMLRPFeatures.xml index 62ba7f01..f7f134a4 100644 --- a/MyLittleRimPony/HugsLib/News/NewMLRPFeatures.xml +++ b/MyLittleRimPony/HugsLib/News/NewMLRPFeatures.xml @@ -10,7 +10,7 @@ MLRP_Version_600 6.0.0 - <b>WHAT'S NEW?</b>\n\nThe mod is now available in French.\n\n- Core: Support for RimWorld 1.4 has been removed.\n- Core: You can now request reinforced barrels from Nightmare Moon once you research mortars.\n- Core: Enemies now have a chance to drop ruined plushies, which you can recycle at the plushie bench to get some materials.\n- Core: Nightmare Moon is no longer accepting item returns.\n- Core: Once you've researched brewing, Daybreaker will be able to help you make wort.\n- Biotech: The Diamond Dogs have learned archery.\n- Anomaly: Thingpone recipes now require twisted meat as well as silver.\n- Ponies of the Rim: Ponies will no longer spawn with the xenotypes and/or genes added by My Little RimPony.\n\nRefer to the changelog for full details on all the changes! (There's a lot.) + <b>WHAT'S NEW?</b>\n\nThe mod is now available in French.\n\n- Core: Support for RimWorld 1.4 has been removed.\n- Core: You can now request reinforced barrels from Nightmare Moon once you research mortars.\n- Core: Enemies now have a chance to drop ruined plushies, which you can recycle at the plushie bench to get some materials.\n- Core: Nightmare Moon is no longer accepting item returns.\n- Core: Once you've researched brewing, Daybreaker will be able to help you make wort.\n- Biotech: The Diamond Dogs have learned archery.\n- Anomaly: All Thingpone recipes now require twisted meat as well as silver.\n- Ponies of the Rim: Ponies will no longer spawn with the xenotypes and/or genes added by My Little RimPony.\n\nRefer to the changelog for full details on all the changes! (There's a lot.) diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/acf0d07c-b130-4f97-9875-b396b9fdd211.vsidx b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/acf0d07c-b130-4f97-9875-b396b9fdd211.vsidx deleted file mode 100644 index 21347e63..00000000 Binary files a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/acf0d07c-b130-4f97-9875-b396b9fdd211.vsidx and /dev/null differ diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/c42331ae-d54f-4cb6-8280-0fb5a203aaab.vsidx b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/c42331ae-d54f-4cb6-8280-0fb5a203aaab.vsidx new file mode 100644 index 00000000..957a61fb Binary files /dev/null and b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/c42331ae-d54f-4cb6-8280-0fb5a203aaab.vsidx differ diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/920fa601-f9ac-4b90-a76d-75968fa66590.vsidx b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/ca124889-f7ba-46de-aec4-e1908e356a85.vsidx similarity index 99% rename from MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/920fa601-f9ac-4b90-a76d-75968fa66590.vsidx rename to MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/ca124889-f7ba-46de-aec4-e1908e356a85.vsidx index aeb4f62b..0a3bfd6d 100644 Binary files a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/920fa601-f9ac-4b90-a76d-75968fa66590.vsidx and b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/ca124889-f7ba-46de-aec4-e1908e356a85.vsidx differ diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/.suo b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/.suo index 499bd838..f29d7167 100644 Binary files a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/.suo and b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/.suo differ diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.json b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.json index 79405c8a..c0ba3def 100644 --- a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.json +++ b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.json @@ -3,19 +3,22 @@ "WorkspaceRootPath": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\mylittlerimpony.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|solutionrelative:mylittlerimpony.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{00000000-0000-0000-0000-000000000000}|\u003CSolution\u003E|MLRP_Assemblies||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|" }, { - "AbsoluteMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\mylittlerimpony\\source\\mlrp_researchnotifications.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|solutionrelative:mlrp_researchnotifications.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\mylittlerimpony\\source\\mylittlerimpony.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|solutionrelative:mylittlerimpony.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\mlrp_biotech.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|solutionrelative:mlrp_biotech.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{00000000-0000-0000-0000-000000000000}|\u003CSolution\u003E|MLRP_Assemblies||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|" + "AbsoluteMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\mlrp_researchnotifications.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|solutionrelative:mlrp_researchnotifications.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|e:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\mylittlerimpony\\source\\||{B270807C-D8C6-49EB-8EBE-8E8D566637A1}|5e9a8ac2-4f34-4521-858f-4c248ba31532" } ], "DocumentGroupContainers": [ @@ -25,28 +28,29 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 0, "Children": [ { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 0, "Title": "MLRP_Assemblies", "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_Assemblies.csproj", "RelativeDocumentMoniker": "MLRP_Assemblies.csproj", "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_Assemblies.csproj", "RelativeToolTip": "MLRP_Assemblies.csproj", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", - "WhenOpened": "2024-08-06T18:35:38.531Z" + "WhenOpened": "2024-08-06T18:35:38.531Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 1, "Title": "MyLittleRimPony.cs", "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MyLittleRimPony.cs", "RelativeDocumentMoniker": "MyLittleRimPony.cs", "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MyLittleRimPony.cs", "RelativeToolTip": "MyLittleRimPony.cs", - "ViewState": "AQIAAFgBAAAAAAAAAAAUwH8BAAANAAAA", + "ViewState": "AQIAAL0BAAAAAAAAAAAYwB8AAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-08-06T18:35:21.326Z", "EditorCaption": "" @@ -59,22 +63,21 @@ "RelativeDocumentMoniker": "MLRP_Biotech.cs", "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_Biotech.cs", "RelativeToolTip": "MLRP_Biotech.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAE0AAAAYAAAA", + "ViewState": "AQIAAMwAAAAAAAAAAAAowOsAAAAFAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-08-21T15:20:51.722Z" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 3, "Title": "MLRP_ResearchNotifications.cs", "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_ResearchNotifications.cs", "RelativeDocumentMoniker": "MLRP_ResearchNotifications.cs", "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_ResearchNotifications.cs", "RelativeToolTip": "MLRP_ResearchNotifications.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABYAAAAFAAAA", + "ViewState": "AQIAAIYAAAAAAAAAAAAYwLYAAACIAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-08-06T18:35:23.95Z", - "EditorCaption": "" + "WhenOpened": "2024-08-06T18:35:23.95Z" } ] } diff --git a/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs b/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs index 32fe0f67..6d016102 100644 --- a/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs +++ b/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs @@ -52,6 +52,26 @@ private static void Postfix(ResearchProjectDef proj) string text = "MLRP_NewRecipeUnlockedTextDB".Translate(); Find.LetterStack.ReceiveLetter(title, text, MLRP_NewDBRecipe); } + + // PLUSHIE BENCH: CORE + + if (proj == DefDatabase.GetNamed("MLRP_PlushieRecycling") || proj == DefDatabase.GetNamed("MLRP_CurePoisonJokeAddictionResearch")) + { + LetterDef MLRP_NewPBRecipe = LetterDefOf.PositiveEvent; + string title = "MLRP_NewRecipeUnlockedTitle".Translate(); + string text = "MLRP_NewRecipeUnlockedTextPB".Translate(); + Find.LetterStack.ReceiveLetter(title, text, MLRP_NewPBRecipe); + } + + // PLUSHIE BENCH: COMBAT EXTENDED MOD + + if (ModsConfig.IsActive("CETeam.CombatExtended") && proj == DefDatabase.GetNamed("MLRP_CE_AmmoResearch")) + { + LetterDef MLRP_NewPBRecipe = LetterDefOf.PositiveEvent; + string title = "MLRP_NewRecipeUnlockedTitle".Translate(); + string text = "MLRP_NewRecipeUnlockedTextPB".Translate(); + Find.LetterStack.ReceiveLetter(title, text, MLRP_NewPBRecipe); + } // FABRIC EXCHANGE @@ -157,6 +177,16 @@ private static void Postfix(ResearchProjectDef proj) string text = "MLRP_NewRecipeUnlockedTextTP".Translate(); Find.LetterStack.ReceiveLetter(title, text, MLRP_NewTPRecipe); } + + // SCREWBALL: HIGHER POWER MOD + + if (ModsConfig.IsActive("leion247612.HigherHPower") && proj == DefDatabase.GetNamed("HP_AdvancedPower")) + { + LetterDef MLRP_ExtraScrewballOutput = LetterDefOf.PositiveEvent; + string title = "MLRP_ExtraScrewballOutputTitle".Translate(); + string text = "MLRP_ExtraScrewballOutputText".Translate(); + Find.LetterStack.ReceiveLetter(title, text, MLRP_ExtraScrewballOutput); + } } } } diff --git a/MyLittleRimPony/Source/MyLittleRimPony.cs b/MyLittleRimPony/Source/MyLittleRimPony.cs index e880c5fa..c5f5de25 100644 --- a/MyLittleRimPony/Source/MyLittleRimPony.cs +++ b/MyLittleRimPony/Source/MyLittleRimPony.cs @@ -460,6 +460,11 @@ public override float GetScore(Room room) } // PLUSHIE RECYCLING + + public class RecyclePlushieExtension : DefModExtension + { + public int reclaimedAmount = 75; // Default value if not specified + } public class Recipe_RecyclePlushie : RecipeWorker { @@ -470,7 +475,12 @@ public override void ConsumeIngredient(Thing ingredient, RecipeDef recipe, Map m if (stuff != null) { - int amount = 75; + // Try to get the mod extension that contains the 'reclaimedAmount' value + var extension = recipe.GetModExtension(); + + // Use the value from the extension, default to 75 if not found + int amount = extension?.reclaimedAmount ?? 75; + Thing reclaimedMaterial = ThingMaker.MakeThing(stuff); reclaimedMaterial.stackCount = amount; GenPlace.TryPlaceThing(reclaimedMaterial, ingredient.Position, map, ThingPlaceMode.Near); diff --git a/MyLittleRimPony/Source/Properties/AssemblyInfo.cs b/MyLittleRimPony/Source/Properties/AssemblyInfo.cs index 7b76970b..c2dec2ab 100644 --- a/MyLittleRimPony/Source/Properties/AssemblyInfo.cs +++ b/MyLittleRimPony/Source/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("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.0.0")] +[assembly: AssemblyVersion("6.5.23.0")] +[assembly: AssemblyFileVersion("6.5.23.0")] [assembly: NeutralResourcesLanguage("")] diff --git a/MyLittleRimPony/Source/obj/Debug/MLRP_Assemblies.csproj.AssemblyReference.cache b/MyLittleRimPony/Source/obj/Debug/MLRP_Assemblies.csproj.AssemblyReference.cache index 3dc20990..e5ba63e2 100644 Binary files a/MyLittleRimPony/Source/obj/Debug/MLRP_Assemblies.csproj.AssemblyReference.cache and b/MyLittleRimPony/Source/obj/Debug/MLRP_Assemblies.csproj.AssemblyReference.cache differ diff --git a/MyLittleRimPony/Source/obj/Debug/MyLittleRimPony.dll b/MyLittleRimPony/Source/obj/Debug/MyLittleRimPony.dll index f990e6ee..b323498f 100644 Binary files a/MyLittleRimPony/Source/obj/Debug/MyLittleRimPony.dll and b/MyLittleRimPony/Source/obj/Debug/MyLittleRimPony.dll differ diff --git a/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Biotech/MLRP_BiotechAchievements.xml b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Biotech/MLRP_BiotechAchievements.xml index 1cd203d6..29ad0085 100644 --- a/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Biotech/MLRP_BiotechAchievements.xml +++ b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Biotech/MLRP_BiotechAchievements.xml @@ -93,7 +93,6 @@ Achievements/GiftOfTheGab 25 - diff --git a/MyLittleRimPony/Vanilla Backstories Expanded/Defs/BackstoryDefs/MLRP_VBE_Backstories.xml b/MyLittleRimPony/Vanilla Backstories Expanded/Defs/BackstoryDefs/MLRP_VBE_Backstories.xml index 3bd78e04..0f1bf13c 100644 --- a/MyLittleRimPony/Vanilla Backstories Expanded/Defs/BackstoryDefs/MLRP_VBE_Backstories.xml +++ b/MyLittleRimPony/Vanilla Backstories Expanded/Defs/BackstoryDefs/MLRP_VBE_Backstories.xml @@ -1,10 +1,10 @@ - Adulthood - MLP Obsessive MLRP_VBE_MLPFanBackstory + MLP Obsessive MLP Obsessive [PAWN_nameDef] is utterly obsessed with My Little Pony, and has spent most of [PAWN_possessive] adult life watching every episode and movie on repeat, as well as making [PAWN_possessive] own art, fanfiction and plushies.\n\nAs a result, [PAWN_pronoun] is very passionate about making friends and creating things, but is completely incapable of any other skills. + Adulthood
  • Offworld
  • Outlander
  • diff --git a/MyLittleRimPony/Vanilla Backstories Expanded/Languages/French/DefInjected/BackstoryDefs/MLRP_Backstories_FR.xml b/MyLittleRimPony/Vanilla Backstories Expanded/Languages/French/DefInjected/BackstoryDefs/MLRP_Backstories_FR.xml new file mode 100644 index 00000000..8922761a --- /dev/null +++ b/MyLittleRimPony/Vanilla Backstories Expanded/Languages/French/DefInjected/BackstoryDefs/MLRP_Backstories_FR.xml @@ -0,0 +1,12 @@ + + + + Obsédé par les poneys + + + Obsédé par les poneys + + + [PAWN_nameDef] est totalement obsédé par Mon Petite Poney et a passé la majeure partie de sa vie d'adulte à regarder tous les épisodes et les films en boucle, ainsi qu'à créer ses propres œuvres d'art, fanfictions et peluches.\n\nIl est donc passionné par l'idée de se faire des amis et de créer des choses, mais il est totalement incapable de maîtriser d'autres compétences. + + \ No newline at end of file diff --git a/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Defs/RecipeDefs/IntelRequest.xml b/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Defs/RecipeDefs/IntelRequest.xml index 7926bc7c..1fea1901 100644 --- a/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Defs/RecipeDefs/IntelRequest.xml +++ b/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Defs/RecipeDefs/IntelRequest.xml @@ -47,7 +47,7 @@ - 25 + 10 diff --git a/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml b/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml index 8bfb42be..a43d036e 100644 --- a/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml +++ b/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml @@ -1236,6 +1236,21 @@ + + +
  • + geodesicdragon.rimpony + MLRP_PlushieRecyclingStuffGain + 75 + + + Defs/RecipeDef[defName="MLRP_RecyclePlushies"]/modExtensions/li/reclaimedAmount + + {MLRP_PlushieRecyclingStuffGain} + + + +
  • @@ -1303,6 +1318,15 @@
  • +
  • + MLRP_PlushieRecyclingStuffGain + 75 + 75 + 150 + + 0 +
  • +
  • MLRP_DubsBadHygiene_PippIsShort