diff --git a/MyLittleRimPony/About/About.xml b/MyLittleRimPony/About/About.xml index 0ad689f0..248fbfd7 100644 --- a/MyLittleRimPony/About/About.xml +++ b/MyLittleRimPony/About/About.xml @@ -2,8 +2,8 @@ [MLP] My Little RimPony GeodesicDragon geodesicdragon.rimpony - https://discord.gg/BGKnpza - 6.9.56 + https://github.com/GeodesicDragon/mylittlerimpony/wiki + 6.33.82
  • 1.5
    •  @@ -16,9 +16,11 @@
  • WheatyTail.MyLittleRimPonyRus
    • +
  • ferny.ProgressionStorytellers
    •
  • brrainz.harmony
    • +
  • vanillaexpanded.achievements
  • imranfish.xmlextensions
  • CETeam.CombatExtended
    •  diff --git a/MyLittleRimPony/About/Changelog.txt b/MyLittleRimPony/About/Changelog.txt index b96c674a..e4d9b0e8 100644 --- a/MyLittleRimPony/About/Changelog.txt +++ b/MyLittleRimPony/About/Changelog.txt @@ -1,3 +1,69 @@ +Version 6.33.82 (November 25th 2024) + +IMPORTANT: Non-Steam users are advised to perform a fresh install, as some files have been moved to different folders. + +* Core: Added a new plushie slot exclusively for Starlight Glimmer plushies. + * I don't know about you, but I often kept forgetting to tell my colonists to unequip the Starlight plushie they were wearing during the last psychic drone and re-equip whatever they had before. + * Any Starlight plushies your colonists already have equipped should automatically unequip when you load a saved game. + * Remember, make sure that your psycasters have an apparel policy set which forbids them from using the Starlight plush. + * The child equippable Starlight plushie is also affected by this change. +* Royalty: Added a new recipe to the Nightmare Moon statue which lets you request psychic sensitizers. + * Cost is 1500 silver (1.5x the market value of 1000, as specified on the RimWorld wiki). + * Recipe is unlocked once you complete some research at a high-tech research bench. +* Royalty: Added a new research project which, when completed, will unlock the ability to request psychic items from Nightmare Moon. +* Allergies: Added Mage Meadowbrook (-25% allergic sensitivity). +* Dubs Bad Hygiene: Added a new recipe to the Daybreaker statue which will allow you to create chemfuel from fecal sludge in bulk. + * Unlocked once you have researched septic tanks. + * Makes 700 chemfuel from 1500 sludge. + * Does not require any chemfuel, but requires 1500 work (five times more than other Daybreaker recipes, but half the amount it normally takes). +* Ponies of The Rim: Added 15 new compatibility patches. + * Bronies agree with the love and tolerance meme. + * Bronies agree with the harmonism meme. + * Bronies disagree with the earthpony supremacist meme. + * Bronies disagree with the unicorn supremacist meme. + * Bronies disagree with the pegasus supremacist meme. + * Anti bronies disagree with the love and tolerance meme. + * Anti bronies disagree with the harmonism meme. + * Anti bronies disagree with the earthpony supremacist meme. + * Anti bronies disagree with the unicorn supremacist meme. + * Anti bronies disagree with the pegasus supremacist meme. + * Anti bronies don't care about the outcome of the oracle ritual. + * Bronies love ponyx as much as they love regular ponies. + * Anti bronies hate ponyx as much as they hate regular ponies. + * Updated the description of pony fur. + * Updated the description of pony meat. +* Vanilla Achievements Expanded: Added four new achievements. + * Fire Hazard + * The Healer Is In (requires Allergies mod) + * This Isn't Funny Any More + * You're Kidding, Right? +* Core: If you are using the Progression: Storytellers mod, Sunny Starscout will be classified as a 'Slow-paced' storyteller. +* Core: Updated the ruined plushie texture. I made it myself, so it still sucks, but at least it makes sense (unlike the old one). +* Core: Raiders will no longer target Discord lamps. +* Royalty: Requesting psychic neuroformers is now locked behind the new research. +* Biotech: Increased combat power of Diamond Dog soldiers to 75 (was 40). +* Biotech: Increased combat power of Diamond Dog archers to 75 (was 40). +* Biotech: Increased combat power of Diamond Dog alphas (leader pawn) to 90 (was 60). +* Dubs Bad Hygiene: Herbal cure kits now cure diarrhea. +* Ponies of the Rim: Bronies now get a mood debuff from wearing apparel made from pony leather, from -2 to -8 depending on the number of pieces. This mood debuff occurs regardless of pro-cannibalism traits and ideologies. +* Ponies of the Rim: Anti bronies now get a mood buff from wearing apparel made from pony leather, from +2 to +8 depending on the number of pieces. This mood debuff occurs regardless of anti-cannibalism traits and ideologies. +* Ponies of the Rim: Bronies now get -10 to mood for 1 day after eating pony meat. Occurs regardless of pro-cannibalism traits and ideologies. +* Ponies of the Rim: Anti bronies now get +10 to mood for 6 hours after eating pony meat. Occurs regardless of anti-cannibalism traits and ideologies. +* Ponies of the Rim: Uncommented the patches I added in Version 5.42.72 so that they now work. +* Vanilla Achievements Expanded: Changed the texture of the 'Fun, Fun, Fun, Fun, Fun!' achievement. +* Vanilla Achievements Expanded: Reduced the points value of the 'Feelin' Hot, Hot, Hot' achievement to 10 (was 50). +* Vanilla Achievements Expanded: Reduced the points value of the 'Give Us Something Sweet To Bite' achievement to 10 (was 50). +* Vanilla Achievements Expanded: Reduced the points value of the 'The Other Fashion Mare' achievement to 10 (was 25). +* Vanilla Achievements Expanded: Reduced the points value of the 'Mm-Hmm' achievement to 10 (was 25). +* Vanilla Achievements Expanded: Reduced the points value of the 'Namesake' achievement to 10 (was 25). +* Vanilla Achievements Expanded: Reduced the points value of the 'Miss Harshwinter' achievement to 10 (was 25). +* Vanilla Achievements Expanded: Reduced the points value of the 'Friendship Is Firepower' achievement to 25 (was 50). +* Vanilla Achievements Expanded: Reduced the points value of the 'Party Hard' achievement to 25 (was 50). +* Vanilla Achievements Expanded: Reduced the points value of the 'Fun, Fun, Fun, Fun, Fun!' achievement to 50 (was 100). +* Vanilla Outposts Expanded: Fixed 'Could not resolve cross-reference to KCSG.StructureLayoutDef named Outpost_Struct_Production (wanter=chooseFromlayouts)' error. +* Vanilla Outposts Expanded: Plushie factories now generate silver every 7 days (was 5). +* Vanilla Outposts Expanded: Weapon factories now generate weapons every 15 days (was 7.5). + Version 6.9.56 (November 3rd 2024) * Combat Extended: Added harmony lasers (Sabot) as a new ammo type for the rainbow laser and Sweetie bot turrets/mechs. diff --git a/MyLittleRimPony/About/Credits.txt b/MyLittleRimPony/About/Credits.txt index e512bcbc..5d7a15e2 100644 --- a/MyLittleRimPony/About/Credits.txt +++ b/MyLittleRimPony/About/Credits.txt @@ -6,9 +6,9 @@ KEY * Source provided on Derpibooru was either missing or invalid. ** I had to make some minor edits to this image before I could use it. -*** This image is used by an item or building which is only seen if a particular mod or game version is enabled. +*** This image is used by an item or building which is only seen if a particular mod is enabled. -CREDITS +CORE Apple Bloom: sketchmcreations (1553341) Applejack: CindyDreamLight (2450572) @@ -27,7 +27,6 @@ Nurse Redheart: drfatalchunk (1464636) * Izzy Moonbow (plush): inaactive (2561243) Izzy Moonbow (smoke launcher): ejlightning007arts (2718787) Pinkie Pie: flizzick (2490254) -Pipp Petals: ejlightning007arts (2762024) *** Princess Cadence: princesscaramelo (2115510) Princess Celestia: killagouge (2058026) Princess Luna: chrzanek97 (2124813) @@ -44,29 +43,11 @@ Sweetie Belle: sirwarluscake (1184509) * Sweetie Bot: weegeestareatyou (1180288) Alicorn Twilight Sparkle: andoanimalia (2521465) Ruler of Equestria Twilight Sparkle: andoanimalia (2280601) -Unicorn Twilight Sparkle: redpandapony (2779548) *** Elements of Harmony: spiritofthwwolf (sic) (63922) * Cutie Mark Crusaders: parclytaxel (1761090) * - -Aloe and Lotus: jennieoo (773287) -Trixie: chrzanek97 (2584896) - -Flim and Flam: sollace (1838589) -King Sombra: frownfactory (1907550) -Queen Chrysalis: sketchmcreations (2496399) -Zecora: uxyd (2560904) -Villain Statue: prixy05 (2999547) - -Button Mash: luckreza8 (1004070) - -Thingpone: dvixie (2640948) ** - Image flipped horizontally - -Equestrian Flag: grabusz (1589868) -Rainbow Laser: Vector-Brony (2493108 - attributed to someone else; original link in description) Mudbriar: cheezedoodle96 (1709144) Quibble Pants: outlaw4rc (1216860) Zephyr Breeze: 19crowbar19* (1740159) -Tree Of Harmony: pridark (2780361) Poison Joke (plant): 3luk (1686090) Poison Joke (item): Me, using a very badly edited version of https://game-icons.net/1x1/delapouite/cigar.html Super Speedy Cider Squeezy 6000: pirill (1628397) @@ -75,12 +56,59 @@ Miss Pommel: chainchomp2 (964470) Derpy Hooves: starryshineviolet (2944310) Party Cannon: benpictures1 (2756837) Marble Pie: littlejurnalina (2824560) ** -Spitfire: fikrieka (2094942) *** Miss Harshwhinny: brony-works (1416923) Herbal Cure Kit: the smiling pony (3064108) Fanfiction (closed): Unknown Artist (280765) Fanfiction (open): Unknown Artist (280756) Fanfiction (shelved): Me, making full use of my -20 art skill +Rainbow Laser: Vector-Brony (2493108 - attributed to someone else; original link in description) +Destroyed plushie: https://game-icons.net/1x1/delapouite/ball-pyramid.html + +ROYALTY + +Aloe and Lotus: jennieoo (773287) +Trixie: chrzanek97 (2584896) + +IDEOLOGY + +Flim and Flam: sollace (1838589) +King Sombra: frownfactory (1907550) +Queen Chrysalis: sketchmcreations (2496399) +Zecora: uxyd (2560904) +Villain Statue: prixy05 (2999547) +Tree Of Harmony: pridark (2780361) + +BIOTECH + +Button Mash: luckreza8 (1004070) +Alicorn icon: https://www.flaticon.com/free-icon/unicorn-horse-head-with-a-horn-and-wings_32717 ** +Earth Pony icon: https://game-icons.net/1x1/delapouite/horse-head.html +Unicorn icon: https://game-icons.net/1x1/delapouite/unicorn.html +Pegasus icon: https://game-icons.net/1x1/skoll/pegasus.html +Heart icon: https://game-icons.net/1x1/zeromancer/heart-minus.html +Shield icon: https://game-icons.net/1x1/sbed/shield.html +Broken Wall icon: https://game-icons.net/1x1/delapouite/broken-wall.html +Horseshoe icon: https://game-icons.net/1x1/delapouite/horseshoe.html +Insect jaws icon: https://game-icons.net/1x1/lorc/insect-jaws.html +Diamond Dog xenotype icon: https://game-icons.net/1x1/lorc/diamond-hard.html +Diamond Dog faction icon: https://game-icons.net/1x1/lorc/cut-diamond.html +Batpony xenotype icon: https://game-icons.net/1x1/lorc/batwing-emblem.html +Batpony xenotype faction icon: https://game-icons.net/1x1/delapouite/bat.html + +ANOMALY + +Thingpone: dvixie (2640948) ** - Image flipped horizontally + +MOD SPECIFIC + +Unicorn Twilight Sparkle (A RimWorld of Magic): redpandapony (2779548) +Spitfire (Vanilla Factions Expanded - Deserters): fikrieka (2094942) +Pipp Petals (Dubs Bad Hygiene): ejlightning007arts (2762024) +Meadowbrook (Allergies): jhayarr23 (1544066) + +OTHER IMAGES + +Equestrian Flag: grabusz (1589868) MAIN MENU BACKGROUNDS (Requires Vanilla Backgrounds Expanded) @@ -107,6 +135,9 @@ What In Tarnation - tardifice (1662705) That Wasn't Very Kind Of You - wissle (2719109) Did Somebody Say 'Cupcakes?' - mrkat7214 (1986994) Special Delivery! - anarchemitis (390978) ** +Fire Hazard - andoanimalia (3238790) +You're Kidding, Right? - pianocube and warpout (2177043) +Fun, Fun, Fun, Fun, Fun! - cloudy glow (3453577) Tombstone Icon: https://game-icons.net/1x1/sbed/tombstone.html ** Talking Icon: https://game-icons.net/1x1/skoll/talk.html @@ -128,22 +159,6 @@ Star image (used in some achievements): http://clipart-library.com/clipart/216.h Harmony Chip: https://www.kindpng.com/imgv/wbxRhx_clip-art-clip-art-chips-computer-chip-clipart/ MLP Logo (used in preview image): Artist Unknown (1411173) ** -Alicorn icon (Biotech): https://www.flaticon.com/free-icon/unicorn-horse-head-with-a-horn-and-wings_32717 ** -Earth Pony icon (Biotech): https://game-icons.net/1x1/delapouite/horse-head.html -Unicorn icon (Biotech): https://game-icons.net/1x1/delapouite/unicorn.html -Pegasus icon (Biotech): https://game-icons.net/1x1/skoll/pegasus.html -Heart icon (Biotech): https://game-icons.net/1x1/zeromancer/heart-minus.html -Shield icon (Biotech): https://game-icons.net/1x1/sbed/shield.html -Broken Wall icon (Biotech): https://game-icons.net/1x1/delapouite/broken-wall.html -Horseshoe icon (Biotech): https://game-icons.net/1x1/delapouite/horseshoe.html -Insect jaws icon (Biotech): https://game-icons.net/1x1/lorc/insect-jaws.html -Diamond Dog xenotype icon (Biotech): https://game-icons.net/1x1/lorc/diamond-hard.html -Diamond Dog faction icon (Biotech): https://game-icons.net/1x1/lorc/cut-diamond.html -Batpony xenotype icon (Biotech): https://game-icons.net/1x1/lorc/batwing-emblem.html -Batpony xenotype faction icon (Biotech): https://game-icons.net/1x1/delapouite/bat.html - -Destroyed plushie: https://game-icons.net/1x1/delapouite/ball-pyramid.html - SOUNDS All sounds, unless otherwise specified below, are taken from the My Little Pony: Friendship is Magic TV series, and are used under Fair Use legislation. Sounds remain bound by the copyright of the owner; they are included in this mod for entertainment purposes only, and no profit is made from them. diff --git a/MyLittleRimPony/Allergies/Defs/ThingDef_PonyPlush/PonyPlush_Meadowbrook.xml b/MyLittleRimPony/Allergies/Defs/ThingDef_PonyPlush/PonyPlush_Meadowbrook.xml new file mode 100644 index 00000000..46ec11ef --- /dev/null +++ b/MyLittleRimPony/Allergies/Defs/ThingDef_PonyPlush/PonyPlush_Meadowbrook.xml @@ -0,0 +1,14 @@ + + + PonyPlush_Meadowbrook + + Meadowbrook has many a cure for many an illness.\n\nCarrying her makes you feel less susceptible to allergens. + + Things/PonyPlush/Meadowbrook + Graphic_Single + + + -0.25 + + + \ No newline at end of file diff --git a/MyLittleRimPony/Allergies/Patches/Royalty/HarmonyChipReducesAllergicSensitivity.xml b/MyLittleRimPony/Allergies/Patches/Royalty/HarmonyChipReducesAllergicSensitivity.xml new file mode 100644 index 00000000..73388fb6 --- /dev/null +++ b/MyLittleRimPony/Allergies/Patches/Royalty/HarmonyChipReducesAllergicSensitivity.xml @@ -0,0 +1,15 @@ + + + + +
  • Royalty
    • +     + + /Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets + + -0.25 + + +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Allergies/Textures/Things/PonyPlush/Meadowbrook.png b/MyLittleRimPony/Allergies/Textures/Things/PonyPlush/Meadowbrook.png new file mode 100644 index 00000000..179bafc0 Binary files /dev/null and b/MyLittleRimPony/Allergies/Textures/Things/PonyPlush/Meadowbrook.png differ diff --git a/MyLittleRimPony/Biotech/Defs/PawnKindDefs/PawnKinds_DiamondDogFaction.xml b/MyLittleRimPony/Biotech/Defs/PawnKindDefs/PawnKinds_DiamondDogFaction.xml index d387cc87..67a86b3d 100644 --- a/MyLittleRimPony/Biotech/Defs/PawnKindDefs/PawnKinds_DiamondDogFaction.xml +++ b/MyLittleRimPony/Biotech/Defs/PawnKindDefs/PawnKinds_DiamondDogFaction.xml @@ -125,7 +125,7 @@ 10~17 Diamond dog alphas - 60 + 90 1 1 @@ -163,7 +163,7 @@ 3~5 Diamond Dog soldiers - 40 + 75 1 1 @@ -201,7 +201,7 @@ 3~5 Diamond Dog archer - 40 + 75 1 1 diff --git a/MyLittleRimPony/Biotech/Defs/ThingDef_PonyPlush/PonyPlush_StarlightGlimmer_Child.xml b/MyLittleRimPony/Biotech/Defs/ThingDef_PonyPlush/PonyPlush_StarlightGlimmer_Child.xml index 55c75c3b..7132f3a9 100644 --- a/MyLittleRimPony/Biotech/Defs/ThingDef_PonyPlush/PonyPlush_StarlightGlimmer_Child.xml +++ b/MyLittleRimPony/Biotech/Defs/ThingDef_PonyPlush/PonyPlush_StarlightGlimmer_Child.xml @@ -1,14 +1,88 @@ - - Apparel + + + + PonyPlush_StarlightGlimmer_Child In her role as guidance councillor at the School of Friendship, Starlight Glimmer spent a lot of time talking to the students and helping them with their problems.\n\nCarrying her makes you feel more in control of your thoughts. Things/PonyPlush/StarlightGlimmer + CutoutComplex + (255,255,255,255) + Graphic_Single + (0.5,0.5) -3 + Apparel + + UnfinishedApparel + + 5 + + +
  • PlushieBench
    • +     + Recipe_Tailor + Crafting +     + Item + True + 10 + True + Industrial + true + + 3000 + 100 + 1.0 + 1 + 0.1 + 1 + 0.05 + 2 + + Item + True + +
  • Pony_Plushies
    • +     + 300 + +
  • Fabric
    • +
  • Leathery
    • +     + +
  • MLRP_Plushie
    • +     + +
  • Pony_Plushie
    • +     + +
  • +
  • + MLRP_PonyPlushEquipped + Waist +
    • +     + + true + false + false + Things/PonyPlush/PlushEquipped + +
  • MLRP_PlushieSlotStarlight
    • +     + +
  • Waist
    • +     + true + +
  • PonyPlushie
    • +     + Child +     \ No newline at end of file diff --git a/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll b/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll index 11d2a190..ce47925e 100644 Binary files a/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll and b/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll differ diff --git a/MyLittleRimPony/Core/Defs/ApparelLayerDefs/PlushieSlot.xml b/MyLittleRimPony/Core/Defs/ApparelLayerDefs/PlushieSlot.xml index a249ef91..7c8ecce5 100644 --- a/MyLittleRimPony/Core/Defs/ApparelLayerDefs/PlushieSlot.xml +++ b/MyLittleRimPony/Core/Defs/ApparelLayerDefs/PlushieSlot.xml @@ -2,8 +2,14 @@ MLRP_PlushieSlot - + 600 + + + MLRP_PlushieSlotStarlight + + 700 + \ No newline at end of file diff --git a/MyLittleRimPony/Core/Defs/Drugs/CurePoisonJokeAddiction.xml b/MyLittleRimPony/Core/Defs/Drugs/CurePoisonJokeAddiction.xml index cbc9cfb6..bf2a545f 100644 --- a/MyLittleRimPony/Core/Defs/Drugs/CurePoisonJokeAddiction.xml +++ b/MyLittleRimPony/Core/Defs/Drugs/CurePoisonJokeAddiction.xml @@ -14,6 +14,7 @@ Plague MagicalCakeAddiction MagicalCakeTolerance + Diarrhea Things/Item/Drug/PoisonJokeCureKit diff --git a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MLRP_Furniture.xml b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MLRP_Furniture.xml index 3b2a9ae2..5dd5e05f 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MLRP_Furniture.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/MLRP_Furniture.xml @@ -72,7 +72,7 @@ MLRP_DiscordLamp - It's a lamp that looks like Discord, what else is there to say?\n\nIt doesn't provide much in the way of light, but it doesn't require any power and will continue operating during solar flares. + It's a lamp that looks like Discord, what else is there to say? While it doesn't provide much in the way of light, it doesn't require any power and will continue operating even during a solar flare.\n\nIts unique design appeals even to your enemies, who will not target it during raids.
  • (255,255,255,0) @@ -80,6 +80,9 @@ true
    • + + true +     \ No newline at end of file diff --git a/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_Base.xml b/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_Base.xml index 8c325dc3..5f95fe4d 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_Base.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_Base.xml @@ -140,4 +140,12 @@ + + + + +
  • PonyPlush_Starlight
    • +     +     +     \ No newline at end of file diff --git a/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_StarlightGlimmer.xml b/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_StarlightGlimmer.xml index 86c3bad2..f5b4b681 100644 --- a/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_StarlightGlimmer.xml +++ b/MyLittleRimPony/Core/Defs/ThingDef_PonyPlush/PonyPlush_StarlightGlimmer.xml @@ -1,13 +1,88 @@ - + + + + PonyPlush_StarlightGlimmer In her role as guidance councillor at the School of Friendship, Starlight Glimmer spent a lot of time talking to the students and helping them with their problems.\n\nCarrying her makes you feel more in control of your thoughts. Things/PonyPlush/StarlightGlimmer + CutoutComplex + (255,255,255,255) + Graphic_Single + 1 -3 + Apparel + + UnfinishedApparel + + 5 + + +
  • PlushieBench
    • +     + Recipe_Tailor + Crafting +     + Item + True + 10 + True + Industrial + true + + 3000 + 100 + 1.0 + 1 + 0.1 + 1 + 0.05 + 2 + + Item + True + +
  • Pony_Plushies
    • +     + 300 + +
  • Fabric
    • +
  • Leathery
    • +     + +
  • MLRP_Plushie
    • +     + +
  • Pony_Plushie
    • +     + +
  • +
  • + MLRP_PonyPlushEquipped + Waist +
    • +     + + true + false + false + Things/PonyPlush/PlushEquipped + +
  • MLRP_PlushieSlotStarlight
    • +     + +
  • Waist
    • +     + true + +
  • PonyPlushie
    • +     +     +     \ No newline at end of file diff --git a/MyLittleRimPony/Core/Patches/ProgressionStorytellers/AddSunnyStarscoutCategory.xml b/MyLittleRimPony/Core/Patches/ProgressionStorytellers/AddSunnyStarscoutCategory.xml new file mode 100644 index 00000000..50131215 --- /dev/null +++ b/MyLittleRimPony/Core/Patches/ProgressionStorytellers/AddSunnyStarscoutCategory.xml @@ -0,0 +1,17 @@ + + + + +
  • Progression: Storytellers
    • +     + + /Defs/StorytellerDef[defName="MLRP_Storyteller_Sunny"] + +
  • + SlowPaced +
    • +     +     +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Core/Textures/Things/PonyPlush/Ruined.png b/MyLittleRimPony/Core/Textures/Things/PonyPlush/Ruined.png index 059e2268..a0269e4a 100644 Binary files a/MyLittleRimPony/Core/Textures/Things/PonyPlush/Ruined.png and b/MyLittleRimPony/Core/Textures/Things/PonyPlush/Ruined.png differ diff --git a/MyLittleRimPony/Dubs Bad Hygiene/Defs/RecipeDefs/DBH_DB_Recipes.xml b/MyLittleRimPony/Dubs Bad Hygiene/Defs/RecipeDefs/DBH_DB_Recipes.xml new file mode 100644 index 00000000..274367d2 --- /dev/null +++ b/MyLittleRimPony/Dubs Bad Hygiene/Defs/RecipeDefs/DBH_DB_Recipes.xml @@ -0,0 +1,35 @@ + + + + + + MLRP_DB_FecalSludge + + Convert 1500 fecal sludge into 700 chemfuel. + Converting materials + GeneralLaborSpeed + Crafting + Cremate + Recipe_Cremate + false + 1500 + +
  • MLRP_Daybreaker
    • +     + +
  • + + +
  • FecalSludge
    • + + + 1500 + +     + + 700 + + SepticTanks +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/HugsLib/News/NewMLRPFeatures.xml b/MyLittleRimPony/HugsLib/News/NewMLRPFeatures.xml index 7fcfb164..bf7e849e 100644 --- a/MyLittleRimPony/HugsLib/News/NewMLRPFeatures.xml +++ b/MyLittleRimPony/HugsLib/News/NewMLRPFeatures.xml @@ -7,6 +7,12 @@ https://discord.gg/BGKnpza + + MLRP_Version_63382 + 6.33.82 + <b>WHAT'S NEW?</b>\n\n- Core: Starlight Glimmer plushies can now be equipped in their very own apparel slot.\n- Royalty: You can now request psychic harmonizers from Nightmare Moon (once you complete the newly added research project).\n- Allergies: Added Meadowbrook (-25% allergic sensitivity).\n- Dubs Bad Hygiene: You can now create 700 chemfuel using 1500 fecal sludge at the Daybreaker statue (once you research septic tanks).\n- Ponies of the Rim: Bronies now suffer mood penalties if they wear pony fur apparel or eat pony meat.\n- Ponies of the Rim: Anti bronies now gain mood bonuses if they wear pony fur apparel or eat pony meat.\n- Ponies of the Rim: More compatibility patches have been added.\n- Vanilla Achievements Expanded: Four new achievements have been added (one is for making the new plush added with the Allergies mod).\n\n<b>WHAT'S CHANGED?</b>\n\n- Core: Raiders will no longer target your Discord lamps.\n- Royalty: Requesting psychic neuroformers from Nightmare Moon now requires you to complete the aforementioned newly added research.\n- Vanilla Achievements Expanded: Some achievements have had their points value nerfed.\n\nPlease refer to the changelog for more info! + + MLRP_Version_6956 6.9.56 diff --git a/MyLittleRimPony/LoadFolders.xml b/MyLittleRimPony/LoadFolders.xml index 8f8197c3..ba57fe41 100644 --- a/MyLittleRimPony/LoadFolders.xml +++ b/MyLittleRimPony/LoadFolders.xml @@ -13,6 +13,7 @@
  • Dubs Bad Hygiene
  • Ponies of the Rim
  • Rim War
    • +
  • Allergies
  • Vanilla Achievements Expanded
  • Vanilla Backgrounds Expanded
  • Vanilla Backstories Expanded
    • diff --git a/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyFurApparel.xml b/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyFurApparel.xml new file mode 100644 index 00000000..d1b7a76d --- /dev/null +++ b/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyFurApparel.xml @@ -0,0 +1,65 @@ + + + + MLRP_PonyFurApparelSad + MLRP_PoniesOfTheRim.ThoughtWorker_PonyLeatherApparel + true + +
  • + + It's bad enough that the pony had to die in the first place. + -2 +
    • +
  • + + Is there really nothing else to wear? + -4 +
    • +
  • + + I hate myself. + -6 +
    • +
  • + + Strike me down, almighty Princesses, for I don't deserve to live any longer. + -8 +
    • +     + +
  • MLRP_BronyTrait
    • +     +     + + + MLRP_PonyFurApparelHappy + MLRP_PoniesOfTheRim.ThoughtWorker_PonyLeatherApparel + true + +
  • + + Hmm, looks like those things are useful after all. + 2 +
    • +
  • + + This is good, but there has to be more I can wear. + 4 +
    • +
  • + + Oh, yeah, I'm definitely 'feeling the magic' now! + 6 +
    • +
  • + + Cower before me, you disgusting little quadrupeds! + 8 +
    • +     + +
  • MLRP_AntiBronyTrait
    • +     +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyMeat.xml b/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyMeat.xml new file mode 100644 index 00000000..d6b2dae5 --- /dev/null +++ b/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyMeat.xml @@ -0,0 +1,37 @@ + + + + + + MLRP_BronyAtePonyMeat + + Thought_Memory + 1 + 1 + +
  • + + How could I sink so low? + -10 +
    • +     +     + + + + + MLRP_AntiBronyAtePonyMeat + + Thought_Memory + 0.5 + 1 + +
  • + + Mmm, magic. Heh. + 10 +
    • +     +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyPawns.xml b/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyPawns.xml index a78add61..06741fd7 100644 --- a/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyPawns.xml +++ b/MyLittleRimPony/Ponies of the Rim/Defs/ThoughtDefs/Thoughts_PonyPawns.xml @@ -2,32 +2,64 @@ MLRP_BronyLovesPony - MyLittleRimPony.Thought_BronyLovesPony - MyLittleRimPony.ThoughtWorker_BronyLovesPony + MLRP_PoniesOfTheRim.Thought_BronyLovesPony + MLRP_PoniesOfTheRim.ThoughtWorker_BronyLovesPony true - -
  • - -
    • -     - -
  • MLRP_BronyTrait
    • -     + +
  • + +
    • +     + +
  • MLRP_BronyTrait
    • +     MLRP_AntiBronyHatesPony - MyLittleRimPony.Thought_AntiBronyHatesPony - MyLittleRimPony.ThoughtWorker_AntiBronyHatesPony + MLRP_PoniesOfTheRim.Thought_AntiBronyHatesPony + MLRP_PoniesOfTheRim.ThoughtWorker_AntiBronyHatesPony true - -
  • - -
    • -     - -
  • MLRP_AntiBronyTrait
    • -     + +
  • + +
    • +     + +
  • MLRP_AntiBronyTrait
    • +     +     + + + + + MLRP_BronyLovesPonyx + MLRP_PoniesOfTheRim.Thought_BronyLovesPonyx + MLRP_PoniesOfTheRim.ThoughtWorker_BronyLovesPonyx + true + +
  • + +
    • +     + +
  • MLRP_BronyTrait
    • +     +     + + + MLRP_AntiBronyHatesPonyx + MLRP_PoniesOfTheRim.Thought_AntiBronyHatesPonyx + MLRP_PoniesOfTheRim.ThoughtWorker_AntiBronyHatesPonyx + true + +
  • + +
    • +     + +
  • MLRP_AntiBronyTrait
    • +     \ No newline at end of file diff --git a/MyLittleRimPony/Ponies of the Rim/Patches/Biotech/POTR_Biotech_GeneDef_Patches.xml b/MyLittleRimPony/Ponies of the Rim/Patches/Biotech/POTR_Biotech_GeneDef_Patches.xml index 55239880..cc116bc1 100644 --- a/MyLittleRimPony/Ponies of the Rim/Patches/Biotech/POTR_Biotech_GeneDef_Patches.xml +++ b/MyLittleRimPony/Ponies of the Rim/Patches/Biotech/POTR_Biotech_GeneDef_Patches.xml @@ -69,5 +69,51 @@ + + \ No newline at end of file diff --git a/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_DescriptionChanges.xml b/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_DescriptionChanges.xml new file mode 100644 index 00000000..fe5686fe --- /dev/null +++ b/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_DescriptionChanges.xml @@ -0,0 +1,17 @@ + + + + Defs/ThingDef[defName="Meat_Pony"]/description + + Raw buthered flesh of a member of the pony race. Can be used as food, but most individuals will not take this idea well. Considered cannibal food for both ponies and other races.\n\nBronies will be horrified if they eat this or any meal containing it, while anti bronies will be happy about it. + + + + + Defs/ThingDef[defName="PonyFur"]/description + + Soft fluffy skin taken from one of the pony races. Many consider the use of this material to be unethical due to the mere thought of butchering such a creature. Its pink color is somewhat reminiscent of cupcakes.\n\nBronies detest the idea of wearing apparel made of this material, while anti bronies seem to get a kick out of it. + + + + \ No newline at end of file diff --git a/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_Tips.xml b/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_Tips.xml new file mode 100644 index 00000000..da4ab1a1 --- /dev/null +++ b/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_Tips.xml @@ -0,0 +1,11 @@ + + + + Defs/TipSetDef[defName="MyLittleRimPony_Tips"]/tips + +
  • Pawns with the brony trait will gain a mood penalty if they consume pony meat or wear pony fur apparel.
    • +
  • Pawns with the anti brony trait will gain a mood bonus if they consume pony meat or wear pony fur apparel.
    • +     +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_TraitConflicts.xml b/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_TraitConflicts.xml index e2ac2e6a..26f9ae7d 100644 --- a/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_TraitConflicts.xml +++ b/MyLittleRimPony/Ponies of the Rim/Patches/Core/POTR_TraitConflicts.xml @@ -1,19 +1,19 @@ - + \ No newline at end of file diff --git a/MyLittleRimPony/Ponies of the Rim/Patches/Ideology/POTR_Ideology_MemePatches.xml b/MyLittleRimPony/Ponies of the Rim/Patches/Ideology/POTR_Ideology_MemePatches.xml new file mode 100644 index 00000000..7bdc43b0 --- /dev/null +++ b/MyLittleRimPony/Ponies of the Rim/Patches/Ideology/POTR_Ideology_MemePatches.xml @@ -0,0 +1,80 @@ + + + + + + +
  • Ideology
    • +     + + Defs/MemeDef[defName="Pony_Friendship" or defName="Pony_Harmonism"]/agreeableTraits + + Defs/MemeDef[defName="Pony_Friendship" or defName="Pony_Harmonism"]/agreeableTraits + +
  • MLRP_BronyTrait
    • +     +     + + Defs/MemeDef[defName="Pony_Friendship" or defName="Pony_Harmonism"] + + +
  • MLRP_BronyTrait
    • +     +     +     +     +     + + + + + +
  • Ideology
    • +     + + Defs/MemeDef[defName="Pony_EarthponySupremacist" or defName="Pony_UnicornSupremacist" or defName="Pony_PegasusSupremacist"]/disagreeableTraits + + Defs/MemeDef[defName="Pony_EarthponySupremacist" or defName="Pony_UnicornSupremacist" or defName="Pony_PegasusSupremacist"]/disagreeableTraits + +
  • MLRP_BronyTrait
    • +
  • MLRP_AntiBronyTrait
    • +     +     + + Defs/MemeDef[defName="Pony_EarthponySupremacist" or defName="Pony_UnicornSupremacist" or defName="Pony_PegasusSupremacist"] + + +
  • MLRP_BronyTrait
    • +
  • MLRP_AntiBronyTrait
    • +     +     +     +     +     + + + + + +
  • Ideology
    • +     + + Defs/MemeDef[defName="Pony_Friendship" or defName="Pony_Harmonism"]/disagreeableTraits + + Defs/MemeDef[defName="Pony_Friendship" or defName="Pony_Harmonism"]/disagreeableTraits + +
  • MLRP_AntiBronyTrait
    • +     +     + + Defs/MemeDef[defName="Pony_Friendship" or defName="Pony_Harmonism"] + + +
  • MLRP_AntiBronyTrait
    • +     +     +     +     +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Ponies of the Rim/Patches/Ideology/POTR_Ideology_ThoughtDef_Patches.xml b/MyLittleRimPony/Ponies of the Rim/Patches/Ideology/POTR_Ideology_ThoughtDef_Patches.xml index aa1637f6..758f9af5 100644 --- a/MyLittleRimPony/Ponies of the Rim/Patches/Ideology/POTR_Ideology_ThoughtDef_Patches.xml +++ b/MyLittleRimPony/Ponies of the Rim/Patches/Ideology/POTR_Ideology_ThoughtDef_Patches.xml @@ -2,7 +2,7 @@ - + + + + + + +
  • Ideology
    • +     + + Defs/ThoughtDef[defName="TerribleFortune" or defName="BadFortune" or defName="GoodFortune" or defName="WonderfulFortune"]/nullifyingTraits + + Defs/ThoughtDef[defName="TerribleFortune" or defName="BadFortune" or defName="GoodFortune" or defName="WonderfulFortune"] + + +
  • MLRP_AntiBronyTrait
    • +     +     +     + + Defs/ThoughtDef[defName="TerribleFortune" or defName="BadFortune" or defName="GoodFortune" or defName="WonderfulFortune"]/nullifyingTraits + +
  • MLRP_AntiBronyTrait
    • +     +     +     +     \ No newline at end of file diff --git a/MyLittleRimPony/Royalty/Defs/RecipeDefs/NightmareMoonOfferingsRoyalty.xml b/MyLittleRimPony/Royalty/Defs/RecipeDefs/NightmareMoonOfferingsRoyalty.xml index 0805ad80..6621b470 100644 --- a/MyLittleRimPony/Royalty/Defs/RecipeDefs/NightmareMoonOfferingsRoyalty.xml +++ b/MyLittleRimPony/Royalty/Defs/RecipeDefs/NightmareMoonOfferingsRoyalty.xml @@ -29,6 +29,7 @@ 1 + MLRP_PsychicItemsResearch @@ -543,4 +544,36 @@ CircadianInfluence + + + + MLRP_NMM_PsychicSensitizer + + Offer silver in exchange for a psychic sensitizer. + Making an offering to Nightmare Moon + GeneralLaborSpeed + Crafting + Cremate + Recipe_Cremate + false + 300 + +
  • MLRP_NightmareMoon
    • +     + +
  • + + +
  • Silver
    • + + + 150 + +     + + 1 + + MLRP_PsychicItemsResearch +     + \ No newline at end of file diff --git a/MyLittleRimPony/Royalty/Defs/ResearchProjectDefs/ResearchProjects_MLRPRoyalty.xml b/MyLittleRimPony/Royalty/Defs/ResearchProjectDefs/ResearchProjects_MLRPRoyalty.xml index 42df8931..3926a46f 100644 --- a/MyLittleRimPony/Royalty/Defs/ResearchProjectDefs/ResearchProjects_MLRPRoyalty.xml +++ b/MyLittleRimPony/Royalty/Defs/ResearchProjectDefs/ResearchProjects_MLRPRoyalty.xml @@ -36,7 +36,7 @@ - + MLRP_HarmonyChipResearch @@ -49,5 +49,16 @@ 0 1 + + + + + MLRP_PsychicItemsResearch + + Nightmare Moon will allow you to request various psychic items from her. + MLRP_ResearchTab + 1 + 1 + \ No newline at end of file diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/3815214f-7953-4493-83c3-1ec81a189652.vsidx b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/3815214f-7953-4493-83c3-1ec81a189652.vsidx deleted file mode 100644 index eb061a53..00000000 Binary files a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/3815214f-7953-4493-83c3-1ec81a189652.vsidx and /dev/null differ diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/845d3eb7-6154-453a-a47b-2cbac210a721.vsidx b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/845d3eb7-6154-453a-a47b-2cbac210a721.vsidx new file mode 100644 index 00000000..be03c634 Binary files /dev/null and b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/845d3eb7-6154-453a-a47b-2cbac210a721.vsidx differ diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/f695a799-b298-4b46-a9d3-d3704b0f3b78.vsidx b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/f695a799-b298-4b46-a9d3-d3704b0f3b78.vsidx new file mode 100644 index 00000000..450c158b Binary files /dev/null and b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/FileContentIndex/f695a799-b298-4b46-a9d3-d3704b0f3b78.vsidx differ diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/.suo b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/.suo index 586de217..3354226f 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.backup.json b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.backup.json new file mode 100644 index 00000000..55ce9770 --- /dev/null +++ b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.backup.json @@ -0,0 +1,103 @@ +{ + "Version": 1, + "WorkspaceRootPath": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\", + "Documents": [ + { + "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\\potr_compatibility.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|solutionrelative:potr_compatibility.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:{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\\||{B270807C-D8C6-49EB-8EBE-8E8D566637A1}|5e9a8ac2-4f34-4521-858f-4c248ba31532" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 0, + "Children": [ + { + "$type": "Document", + "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", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "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": "AgIAAAAAAAAAAAAAAAAAABwAAABHAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-08-06T18:35:21.326Z" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "MLRP_Biotech.cs", + "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_Biotech.cs", + "RelativeDocumentMoniker": "MLRP_Biotech.cs", + "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_Biotech.cs", + "RelativeToolTip": "MLRP_Biotech.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAGwAAAB4AQAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-08-21T15:20:51.722Z" + }, + { + "$type": "Document", + "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": "AgIAAAAAAAAAAAAAAAAAADwAAABJAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-08-06T18:35:23.95Z" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "POTR_Compatibility.cs", + "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\POTR_Compatibility.cs", + "RelativeDocumentMoniker": "POTR_Compatibility.cs", + "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\POTR_Compatibility.cs", + "RelativeToolTip": "POTR_Compatibility.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAC4AAABWAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-23T19:49:45.805Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.json b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.json index e9775fc6..55ce9770 100644 --- a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.json +++ b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v17/DocumentLayout.json @@ -6,8 +6,8 @@ "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\\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\\potr_compatibility.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3D8E10F8-B54B-496B-B134-B150B410CC74}|MLRP_Assemblies.csproj|solutionrelative:potr_compatibility.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}", @@ -17,6 +17,10 @@ "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\\||{B270807C-D8C6-49EB-8EBE-8E8D566637A1}|5e9a8ac2-4f34-4521-858f-4c248ba31532" } @@ -44,13 +48,13 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 4, "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": "AQIAAAAAAAAAAAAAAAAAABsAAABHAAAA", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABwAAABHAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-08-06T18:35:21.326Z" }, @@ -62,7 +66,7 @@ "RelativeDocumentMoniker": "MLRP_Biotech.cs", "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_Biotech.cs", "RelativeToolTip": "MLRP_Biotech.cs", - "ViewState": "AQIAAGsAAAAAAAAAAAAiwOsAAAAFAAAA", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAGwAAAB4AQAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-08-21T15:20:51.722Z" }, @@ -74,9 +78,22 @@ "RelativeDocumentMoniker": "MLRP_ResearchNotifications.cs", "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\MLRP_ResearchNotifications.cs", "RelativeToolTip": "MLRP_ResearchNotifications.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAHsAAABMAAAA", + "ViewState": "AgIAAAAAAAAAAAAAAAAAADwAAABJAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-08-06T18:35:23.95Z" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "POTR_Compatibility.cs", + "DocumentMoniker": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\POTR_Compatibility.cs", + "RelativeDocumentMoniker": "POTR_Compatibility.cs", + "ToolTip": "E:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\MyLittleRimPony\\Source\\POTR_Compatibility.cs", + "RelativeToolTip": "POTR_Compatibility.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAC4AAABWAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-23T19:49:45.805Z", + "EditorCaption": "" } ] } diff --git a/MyLittleRimPony/Source/MLRP_Assemblies.csproj b/MyLittleRimPony/Source/MLRP_Assemblies.csproj index 7dca7ea9..2e35afa3 100644 --- a/MyLittleRimPony/Source/MLRP_Assemblies.csproj +++ b/MyLittleRimPony/Source/MLRP_Assemblies.csproj @@ -56,6 +56,7 @@ + diff --git a/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs b/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs index 08767eb0..7a228eb6 100644 --- a/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs +++ b/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs @@ -52,9 +52,19 @@ private static void Postfix(ResearchProjectDef proj) string text = "MLRP_NewRecipeUnlockedTextDB".Translate(); Find.LetterStack.ReceiveLetter(title, text, MLRP_NewDBRecipe); } - - // PLUSHIE BENCH: CORE - + + // DAYBREAKER: DUBS BAD HYGIENE MOD + + if (ModsConfig.IsActive("Dubwise.DubsBadHygiene") && proj == DefDatabase.GetNamed("SepticTanks")) + { + LetterDef MLRP_NewDBRecipe = LetterDefOf.PositiveEvent; + string title = "MLRP_NewRecipeUnlockedTitle".Translate(); + 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") || proj == DefDatabase.GetNamed("DrugProduction")) { LetterDef MLRP_NewPBRecipe = LetterDefOf.PositiveEvent; @@ -105,7 +115,7 @@ private static void Postfix(ResearchProjectDef proj) // NIGHTMARE MOON: ROYALTY DLC - if (ModsConfig.IsActive("Ludeon.RimWorld.Royalty") && 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")) + if (ModsConfig.IsActive("Ludeon.RimWorld.Royalty") && 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("MLRP_PsychicItemsResearch")) { LetterDef MLRP_NewNMMRecipe = LetterDefOf.PositiveEvent; string title = "MLRP_NewRecipeUnlockedTitle".Translate(); diff --git a/MyLittleRimPony/Source/MyLittleRimPony.cs b/MyLittleRimPony/Source/MyLittleRimPony.cs index 4b40da12..905de6ab 100644 --- a/MyLittleRimPony/Source/MyLittleRimPony.cs +++ b/MyLittleRimPony/Source/MyLittleRimPony.cs @@ -6,6 +6,7 @@ // I am always happy to accept updates to this code, especially if you have a better way of doing something I've done. // Contact me via my Discord server and we'll talk! (Invite Code: BGKnpza) +using HarmonyLib; using RimWorld; using System; using System.Collections.Generic; @@ -140,100 +141,6 @@ public override float OpinionOffset() } } - // BRONIES LOVE ACTUAL PONIES - - public class ThoughtWorker_BronyLovesPony : ThoughtWorker - { - protected override ThoughtState CurrentSocialStateInternal(Pawn p, Pawn otherPawn) - { - if (ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) - { - if (!p.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_BronyTrait"))) - { - return false; - } - if (otherPawn.def.race.body != DefDatabase.GetNamed("Pegasus") && otherPawn.def.race.body != DefDatabase.GetNamed("Pony") && otherPawn.def.race.body != DefDatabase.GetNamed("Unicorn")) - { - return false; - } - } - return true; - } - } - - public class Thought_BronyLovesPony : Thought_SituationalSocial - { - public override float OpinionOffset() - { - if (!ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) - { - - } - else - { - if (ThoughtUtility.ThoughtNullified(pawn, def)) - { - return 0f; - } - if (pawn.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_BronyTrait"))) - { - if (otherPawn.def.race.body == DefDatabase.GetNamed("Pegasus") || otherPawn.def.race.body == DefDatabase.GetNamed("Pony") || otherPawn.def.race.body == DefDatabase.GetNamed("Unicorn")) - { - return 20f; - } - } - } - return 0f; - } - } - - // ANTI BRONIES HATE ACTUAL PONIES - - public class ThoughtWorker_AntiBronyHatesPony : ThoughtWorker - { - protected override ThoughtState CurrentSocialStateInternal(Pawn p, Pawn otherPawn) - { - if (ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) - { - if (!p.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_AntiBronyTrait"))) - { - return false; - } - if (otherPawn.def.race.body != DefDatabase.GetNamed("Pegasus") && otherPawn.def.race.body != DefDatabase.GetNamed("Pony") && otherPawn.def.race.body != DefDatabase.GetNamed("Unicorn")) - { - return false; - } - } - return true; - } - } - - public class Thought_AntiBronyHatesPony : Thought_SituationalSocial - { - public override float OpinionOffset() - { - if (!ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) - { - - } - else - { - if (ThoughtUtility.ThoughtNullified(pawn, def)) - { - return 0f; - } - if (pawn.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_AntiBronyTrait"))) - { - if (otherPawn.def.race.body == DefDatabase.GetNamed("Pegasus") || otherPawn.def.race.body == DefDatabase.GetNamed("Pony") || otherPawn.def.race.body == DefDatabase.GetNamed("Unicorn")) - { - return -120f; // Needs to be this high in order to negate the +20 bonus from the fact that ponies are seen by all as physically appealing. - } - } - } - return 0f; - } - } - // CURE POISON JOKE ADDICTION public class PoisonJokeAddictionCure : IngestionOutcomeDoer @@ -299,6 +206,10 @@ protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested, int pawn.health.RemoveHediff(hediff); Messages.Message("MLRP_PawnCured".Translate(pawn, hediff.Label), MessageTypeDefOf.TaskCompletion, historical: false); break; + case "Diarrhea": // Dubs Bad Hygiene + pawn.health.RemoveHediff(hediff); + Messages.Message("MLRP_PawnCured".Translate(pawn, hediff.Label), MessageTypeDefOf.TaskCompletion, historical: false); + break; default: Log.Warning("MLRP_NothingToCure".Translate(pawn)); break; diff --git a/MyLittleRimPony/Source/POTR_Compatibility.cs b/MyLittleRimPony/Source/POTR_Compatibility.cs new file mode 100644 index 00000000..e5cfd439 --- /dev/null +++ b/MyLittleRimPony/Source/POTR_Compatibility.cs @@ -0,0 +1,274 @@ +using HarmonyLib; +using RimWorld; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using Verse; +using Verse.AI; + +namespace MLRP_PoniesOfTheRim +{ + // BRONIES LOVE ACTUAL PONIES + + public class ThoughtWorker_BronyLovesPony : ThoughtWorker + { + protected override ThoughtState CurrentSocialStateInternal(Pawn p, Pawn otherPawn) + { + if (ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) + { + if (!p.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_BronyTrait"))) + { + return false; + } + if (otherPawn.def.race.body != DefDatabase.GetNamed("Pegasus") && otherPawn.def.race.body != DefDatabase.GetNamed("Pony") && otherPawn.def.race.body != DefDatabase.GetNamed("Unicorn")) + { + return false; + } + } + return true; + } + } + + public class Thought_BronyLovesPony : Thought_SituationalSocial + { + public override float OpinionOffset() + { + if (!ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) + { + + } + else + { + if (ThoughtUtility.ThoughtNullified(pawn, def)) + { + return 0f; + } + if (pawn.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_BronyTrait"))) + { + if (otherPawn.def.race.body == DefDatabase.GetNamed("Pegasus") || otherPawn.def.race.body == DefDatabase.GetNamed("Pony") || otherPawn.def.race.body == DefDatabase.GetNamed("Unicorn")) + { + return 20f; + } + } + } + return 0f; + } + } + + // ANTI BRONIES HATE ACTUAL PONIES + + public class ThoughtWorker_AntiBronyHatesPony : ThoughtWorker + { + protected override ThoughtState CurrentSocialStateInternal(Pawn p, Pawn otherPawn) + { + if (ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) + { + if (!p.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_AntiBronyTrait"))) + { + return false; + } + if (otherPawn.def.race.body != DefDatabase.GetNamed("Pegasus") && otherPawn.def.race.body != DefDatabase.GetNamed("Pony") && otherPawn.def.race.body != DefDatabase.GetNamed("Unicorn")) + { + return false; + } + } + return true; + } + } + + public class Thought_AntiBronyHatesPony : Thought_SituationalSocial + { + public override float OpinionOffset() + { + if (!ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) + { + + } + else + { + if (ThoughtUtility.ThoughtNullified(pawn, def)) + { + return 0f; + } + if (pawn.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_AntiBronyTrait"))) + { + if (otherPawn.def.race.body == DefDatabase.GetNamed("Pegasus") || otherPawn.def.race.body == DefDatabase.GetNamed("Pony") || otherPawn.def.race.body == DefDatabase.GetNamed("Unicorn")) + { + return -120f; // Needs to be this high in order to negate the +20 bonus from the fact that ponies are seen by all as physically appealing. + } + } + } + return 0f; + } + } + + // PONY LEATHER CLOTHING + + public class ThoughtWorker_PonyLeatherApparel : ThoughtWorker + { + // Cache the ThingDef for "PonyFur" to avoid repeatedly querying DefDatabase + private static ThingDef PonyFurDef => DefDatabase.GetNamedSilentFail("PonyFur"); + + public static ThoughtState CurrentThoughtState(Pawn p) + { + // If "PonyFur" is not defined, the mod is not active. Return inactive thought. + if (PonyFurDef == null) + { + return ThoughtState.Inactive; + } + + string reason = null; + int num = 0; + List wornApparel = p.apparel.WornApparel; + + for (int index = 0; index < wornApparel.Count; ++index) + { + if (wornApparel[index].Stuff == PonyFurDef) + { + if (reason == null) + reason = wornApparel[index].def.label; + ++num; + } + } + + if (num == 0) + return ThoughtState.Inactive; + + return num >= 5 ? ThoughtState.ActiveAtStage(4, reason) : ThoughtState.ActiveAtStage(num - 1, reason); + } + + protected override ThoughtState CurrentStateInternal(Pawn p) + { + return CurrentThoughtState(p); + } + } + + // PONY MEAT CONSUMPTION + + [HarmonyPatch(typeof(JobDriver_Ingest), "MakeNewToils")] + public static class JobDriver_Ingest_MakeNewToils_Patch + { + static void Postfix(JobDriver_Ingest __instance) + { + Pawn pawn = __instance.pawn; + Thing food = __instance.job.targetA.Thing; + + if (food != null && pawn.story?.traits?.HasTrait(TraitDef.Named("MLRP_BronyTrait")) == true) + { + if (food.def == DefDatabase.GetNamedSilentFail("Meat_Pony") || + food.TryGetComp()?.ingredients?.Contains(DefDatabase.GetNamedSilentFail("Meat_Pony")) == true) + { + // Add memory thought + pawn.needs.mood.thoughts.memories.TryGainMemory(DefDatabase.GetNamed("MLRP_BronyAtePonyMeat")); + //Log.Message($"[DEBUG] Thought applied to {pawn.Name}"); + } + } + + if (food != null && pawn.story?.traits?.HasTrait(TraitDef.Named("MLRP_AntiBronyTrait")) == true) + { + if (food.def == DefDatabase.GetNamedSilentFail("Meat_Pony") || + food.TryGetComp()?.ingredients?.Contains(DefDatabase.GetNamedSilentFail("Meat_Pony")) == true) + { + // Add memory thought + pawn.needs.mood.thoughts.memories.TryGainMemory(DefDatabase.GetNamed("MLRP_AntiBronyAtePonyMeat")); + //Log.Message($"[DEBUG] Thought applied to {pawn.Name}"); + } + } + } + } + + // BRONIES LOVE PONYX + + public class ThoughtWorker_BronyLovesPonyx : ThoughtWorker + { + protected override ThoughtState CurrentSocialStateInternal(Pawn p, Pawn otherPawn) + { + if (ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) + { + if (!p.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_BronyTrait"))) + { + return false; + } + if (otherPawn.genes.Xenotype != DefDatabase.GetNamed("Ponyx")) + { + return false; + } + } + return true; + } + } + + public class Thought_BronyLovesPonyx : Thought_SituationalSocial + { + public override float OpinionOffset() + { + if (!ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) + { + + } + else + { + if (ThoughtUtility.ThoughtNullified(pawn, def)) + { + return 0f; + } + if (pawn.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_BronyTrait"))) + { + if (otherPawn.genes.Xenotype != DefDatabase.GetNamed("Ponyx")) + { + return 20f; + } + } + } + return 0f; + } + } + + // ANTI BRONIES HATE PONYX + + public class ThoughtWorker_AntiBronyHatesPonyx : ThoughtWorker + { + protected override ThoughtState CurrentSocialStateInternal(Pawn p, Pawn otherPawn) + { + if (ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) + { + if (!p.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_AntiBronyTrait"))) + { + return false; + } + if (otherPawn.genes.Xenotype != DefDatabase.GetNamed("Ponyx")) + { + return false; + } + } + return true; + } + } + + public class Thought_AntiBronyHatesPonyx : Thought_SituationalSocial + { + public override float OpinionOffset() + { + if (!ModsConfig.IsActive("Pony.PoniesOfTheRim.Core")) + { + + } + else + { + if (ThoughtUtility.ThoughtNullified(pawn, def)) + { + return 0f; + } + if (pawn.story.traits.HasTrait(DefDatabase.GetNamed("MLRP_AntiBronyTrait"))) + { + if (otherPawn.genes.Xenotype != DefDatabase.GetNamed("Ponyx")) + { + return -120f; // Needs to be this high in order to negate the +20 bonus from the fact that ponyx are seen by all as physically appealing. + } + } + } + return 0f; + } + } +} diff --git a/MyLittleRimPony/Source/Properties/AssemblyInfo.cs b/MyLittleRimPony/Source/Properties/AssemblyInfo.cs index e0e10035..67d6b7c4 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.9.56.0")] -[assembly: AssemblyFileVersion("6.9.56.0")] +[assembly: AssemblyVersion("6.33.82.0")] +[assembly: AssemblyFileVersion("6.33.82.0")] [assembly: NeutralResourcesLanguage("")] diff --git a/MyLittleRimPony/Source/obj/Debug/MLRP_Assemblies.csproj.CoreCompileInputs.cache b/MyLittleRimPony/Source/obj/Debug/MLRP_Assemblies.csproj.CoreCompileInputs.cache index 58747508..080bd750 100644 --- a/MyLittleRimPony/Source/obj/Debug/MLRP_Assemblies.csproj.CoreCompileInputs.cache +++ b/MyLittleRimPony/Source/obj/Debug/MLRP_Assemblies.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7b8c4ff54d8b155c382dedb5011c5e2594bd585ae01617398d8f9dc917cf681e +e9d52c391dea38ccd9339b02b9cad28a8cdaa1f1728db9797e3b33579de8a29d diff --git a/MyLittleRimPony/Source/obj/Debug/MyLittleRimPony.dll b/MyLittleRimPony/Source/obj/Debug/MyLittleRimPony.dll index 11d2a190..ce47925e 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/Defs/Achievements/MLRP_Achievements.xml b/MyLittleRimPony/Vanilla Achievements Expanded/Defs/Achievements/MLRP_Achievements.xml index 4906e9fa..019e8e06 100644 --- a/MyLittleRimPony/Vanilla Achievements Expanded/Defs/Achievements/MLRP_Achievements.xml +++ b/MyLittleRimPony/Vanilla Achievements Expanded/Defs/Achievements/MLRP_Achievements.xml @@ -210,7 +210,7 @@ Achievements/TenPinkiePies - 100 + 50 @@ -482,7 +482,22 @@ Achievements/FeelinHotHotHot - 50 + 10 + + + + MLRP_Achievement_Daybreaker_Wood + + Build a wooden Daybreaker statue + MLRP_BuildingAchievementTab + + + MLRP_Daybreaker + WoodLog + + + Achievements/FireHazard + 5 @@ -497,7 +512,22 @@ Achievements/GiveUsSomethingSweetToBite - 50 + 10 + + + + MLRP_Achievement_NightmareMoon_Wood + + Build a wooden Nightmare Moon statue + MLRP_BuildingAchievementTab + + + MLRP_NightmareMoon + WoodLog + + + Achievements/YoureKiddingRight + 5 @@ -512,7 +542,7 @@ Achievements/TheOtherFashionMare - 25 + 10 @@ -533,7 +563,7 @@ MLRP_Achievement_DerpyHoovesGold - Build a Derpy Hooves transport pod using gold + Build a golden Derpy Hooves MLRP_BuildingAchievementTab @@ -558,13 +588,13 @@ Achievements/MmHmm - 25 + 10 MLRP_Achievement_MarblePie_MarbleBlocks - Build a Stone Exchange using marble blocks + Build a marble Stone Exchange MLRP_BuildingAchievementTab @@ -573,7 +603,7 @@ Achievements/Namesake - 25 + 10 @@ -635,7 +665,7 @@ Achievements/MissHarshwinter - 25 + 10 @@ -745,7 +775,7 @@ Achievements/FriendshipIsFirepower - 50 + 25 @@ -760,7 +790,7 @@ Achievements/PartyHard - 50 + 25 @@ -825,12 +855,27 @@ 50 + + MLRP_Achievement_PoisonJokeBlindness + + Have a pawn go blind from smoking poison joke + MLRP_AchievementTab + + + MLRP_PoisonJokeBlindness + 1 + + + Achievements/ThisIsntFunnyAnyMore + 50 + + MLRP_Achievement_HumanLeatherTwilight - Craft a Twilight Sparkle plushie using human leather + Craft a human leather Twilight Sparkle plushie MLRP_AchievementTab @@ -846,7 +891,7 @@ MLRP_Achievement_HumanLeatherRarity - Craft a Rarity plushie using human leather + Craft a human leather Rarity plushie MLRP_AchievementTab @@ -862,7 +907,7 @@ MLRP_Achievement_HumanLeatherRainbowDash - Craft a Rainbow Dash plushie using human leather + Craft a human leather Rainbow Dash plushie MLRP_AchievementTab @@ -878,7 +923,7 @@ MLRP_Achievement_HumanLeatherApplejack - Craft an Applejack plushie using human leather + Craft a human leather Applejack plushie MLRP_AchievementTab @@ -894,7 +939,7 @@ MLRP_Achievement_HumanLeatherFluttershy - Craft a Fluttershy plushie using human leather + Craft a human leather Fluttershy plushie MLRP_AchievementTab @@ -910,7 +955,7 @@ MLRP_Achievement_HumanLeatherPinkiePie - Craft a Pinkie Pie plushie using human leather + Craft a human leather Pinkie Pie plushie MLRP_AchievementTab @@ -928,7 +973,7 @@ MLRP_Achievement_ThrumbofurFleurDeLis - Craft a Fleur de Lis plushie using thrumbofur + Craft a thrumbofur Fleur de Lis plushie MLRP_AchievementTab @@ -944,7 +989,7 @@ MLRP_Achievement_BirdskinScootaloo - Craft a Scootaloo plushie using birdskin + Craft a birdskin Scootaloo plushie MLRP_AchievementTab diff --git a/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Allergies/MLRP_AllergiesAchievements.xml b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Allergies/MLRP_AllergiesAchievements.xml new file mode 100644 index 00000000..edf2c8f6 --- /dev/null +++ b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Allergies/MLRP_AllergiesAchievements.xml @@ -0,0 +1,28 @@ + + + + +
  • Allergies
    • +     + + Defs + + + MLRP_Achievement_Meadowbrook + + Craft a Meadowbrook plushie + MLRP_AchievementTab + + + PonyPlush_Meadowbrook + 1 + + + Achievements/TheHealerIsIn + 10 + + + +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Alpha Genes/Patches/Vanilla Achievements Expanded/MLRP_AlphaGenesAchievements.xml b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Alpha Genes/MLRP_AlphaGenesAchievements.xml similarity index 96% rename from MyLittleRimPony/Alpha Genes/Patches/Vanilla Achievements Expanded/MLRP_AlphaGenesAchievements.xml rename to MyLittleRimPony/Vanilla Achievements Expanded/Patches/Alpha Genes/MLRP_AlphaGenesAchievements.xml index 610cdf2a..61f54873 100644 --- a/MyLittleRimPony/Alpha Genes/Patches/Vanilla Achievements Expanded/MLRP_AlphaGenesAchievements.xml +++ b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Alpha Genes/MLRP_AlphaGenesAchievements.xml @@ -2,7 +2,7 @@ -
  • Vanilla Achievements Expanded
    • +
  • Alpha Genes
    •  Defs diff --git a/MyLittleRimPony/Combat Extended/Patches/Vanilla Achievements Expanded/MLRP_CEPatchAchievements.xml b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Combat Extended/MLRP_CEPatchAchievements.xml similarity index 98% rename from MyLittleRimPony/Combat Extended/Patches/Vanilla Achievements Expanded/MLRP_CEPatchAchievements.xml rename to MyLittleRimPony/Vanilla Achievements Expanded/Patches/Combat Extended/MLRP_CEPatchAchievements.xml index d224ca7e..62fdb893 100644 --- a/MyLittleRimPony/Combat Extended/Patches/Vanilla Achievements Expanded/MLRP_CEPatchAchievements.xml +++ b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Combat Extended/MLRP_CEPatchAchievements.xml @@ -2,7 +2,7 @@ -
  • Vanilla Achievements Expanded
    • +
  • Combat Extended
    •  Defs diff --git a/MyLittleRimPony/Dubs Bad Hygiene/Patches/Vanilla Achievements Expanded/MLRP_DubsBadHygiene_Achievements.xml b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Dubs Bad Hygiene/MLRP_DubsBadHygiene_Achievements.xml similarity index 94% rename from MyLittleRimPony/Dubs Bad Hygiene/Patches/Vanilla Achievements Expanded/MLRP_DubsBadHygiene_Achievements.xml rename to MyLittleRimPony/Vanilla Achievements Expanded/Patches/Dubs Bad Hygiene/MLRP_DubsBadHygiene_Achievements.xml index 12c13897..b0f4cf00 100644 --- a/MyLittleRimPony/Dubs Bad Hygiene/Patches/Vanilla Achievements Expanded/MLRP_DubsBadHygiene_Achievements.xml +++ b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Dubs Bad Hygiene/MLRP_DubsBadHygiene_Achievements.xml @@ -2,7 +2,7 @@ -
  • Vanilla Achievements Expanded
    • +
  • Dubs Bad Hygiene
    •  Defs diff --git a/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Patches/Vanilla Achievements Expanded/MLRP_VFE_Deserters_Achievements.xml b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Vanilla Factions Expanded/Deserters/MLRP_VFE_Deserters_Achievements.xml similarity index 93% rename from MyLittleRimPony/Vanilla Factions Expanded/Deserters/Patches/Vanilla Achievements Expanded/MLRP_VFE_Deserters_Achievements.xml rename to MyLittleRimPony/Vanilla Achievements Expanded/Patches/Vanilla Factions Expanded/Deserters/MLRP_VFE_Deserters_Achievements.xml index a6786002..632abf94 100644 --- a/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Patches/Vanilla Achievements Expanded/MLRP_VFE_Deserters_Achievements.xml +++ b/MyLittleRimPony/Vanilla Achievements Expanded/Patches/Vanilla Factions Expanded/Deserters/MLRP_VFE_Deserters_Achievements.xml @@ -2,7 +2,7 @@ -
  • Vanilla Achievements Expanded
    • +
  • Vanilla Factions Expanded - Deserters
    •  Defs diff --git a/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/FireHazard.png b/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/FireHazard.png new file mode 100644 index 00000000..c60764c8 Binary files /dev/null and b/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/FireHazard.png differ diff --git a/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/TenPinkiePies.png b/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/TenPinkiePies.png index 6eb1ccac..eb8a6502 100644 Binary files a/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/TenPinkiePies.png and b/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/TenPinkiePies.png differ diff --git a/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/TheHealerIsIn.png b/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/TheHealerIsIn.png new file mode 100644 index 00000000..c2be63d5 Binary files /dev/null and b/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/TheHealerIsIn.png differ diff --git a/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/YoureKiddingRight.png b/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/YoureKiddingRight.png new file mode 100644 index 00000000..064d4cb9 Binary files /dev/null and b/MyLittleRimPony/Vanilla Achievements Expanded/Textures/Achievements/YoureKiddingRight.png differ diff --git a/MyLittleRimPony/Vanilla Outposts Expanded/Defs/WorldObjectDefs/PlushieFactory.xml b/MyLittleRimPony/Vanilla Outposts Expanded/Defs/WorldObjectDefs/PlushieFactory.xml index 5166e12e..628d66c5 100644 --- a/MyLittleRimPony/Vanilla Outposts Expanded/Defs/WorldObjectDefs/PlushieFactory.xml +++ b/MyLittleRimPony/Vanilla Outposts Expanded/Defs/WorldObjectDefs/PlushieFactory.xml @@ -10,7 +10,7 @@ 5 - 300000 + 420000 60000 MealFine @@ -23,13 +23,13 @@ -
  • + diff --git a/MyLittleRimPony/Vanilla Outposts Expanded/Defs/WorldObjectDefs/WeaponFactory.xml b/MyLittleRimPony/Vanilla Outposts Expanded/Defs/WorldObjectDefs/WeaponFactory.xml index 8c6ad798..020150e7 100644 --- a/MyLittleRimPony/Vanilla Outposts Expanded/Defs/WorldObjectDefs/WeaponFactory.xml +++ b/MyLittleRimPony/Vanilla Outposts Expanded/Defs/WorldObjectDefs/WeaponFactory.xml @@ -3,7 +3,7 @@ MLRP_Weapon_Outpost - Places a temporary, autonomously-led camp that specializes in producing MLP-themed weapons. Each pawn will be responsible for the manufacture of a single weapon; after some time has passed, delivery will be made at the faction's primary colony. + Places a temporary, autonomously-led camp that specializes in producing pony-themed weapons. Each pawn will be responsible for the manufacture of a single weapon; after some time has passed, delivery will be made at the faction's primary colony. Outposts.Outpost_ChooseResult Things/Weapons/RainbowLaser @@ -33,17 +33,17 @@ 1
    • - 450000 + 900000 60000 MealFine -
  • + diff --git a/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml b/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml index 0f6ff4de..71401efd 100644 --- a/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml +++ b/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml @@ -14,6 +14,13 @@ {MLRP_PlushiesCloth} + + + Defs/ThingDef[defName="PonyPlush_StarlightGlimmer"]/costStuffCount + + {MLRP_PlushiesCloth} + +
    • @@ -61,8 +68,16 @@ {MLRP_DB_ChildPlushStuffValueRounded}     + + + Defs/ThingDef[defName="PonyPlush_StarlightGlimmer_Child"]/costStuffCount + + {MLRP_DB_ChildPlushStuffValueRounded} + +     +     @@ -102,6 +117,20 @@ {MLRP_PlushieCraftingSkill}     + + + Defs/ThingDef[defName="PonyPlush_StarlightGlimmer"]/recipeMaker/skillRequirements/Crafting + + {MLRP_PlushieCraftingSkill} + + + + + Defs/ThingDef[defName="PonyPlush_StarlightGlimmer_Child"]/recipeMaker/skillRequirements/Crafting + + {MLRP_PlushieCraftingSkill} + + @@ -117,6 +146,20 @@ true + + + Defs/ThingDef[defName="PonyPlush_StarlightGlimmer"]/apparel/careIfWornByCorpse + + true + + + + + Defs/ThingDef[defName="PonyPlush_StarlightGlimmer_Child"]/apparel/careIfWornByCorpse + + true + + @@ -125,6 +168,20 @@ false + + + Defs/ThingDef[defName="PonyPlush_StarlightGlimmer"]/apparel/careIfWornByCorpse + + false + + + + + Defs/ThingDef[defName="PonyPlush_StarlightGlimmer_Child"]/apparel/careIfWornByCorpse + + false + +