diff --git a/MyLittleRimPony/About/Changelog.txt b/MyLittleRimPony/About/Changelog.txt
index 391dca8e..c6f4f6cc 100644
--- a/MyLittleRimPony/About/Changelog.txt
+++ b/MyLittleRimPony/About/Changelog.txt
@@ -1,3 +1,28 @@
+Version 4.47.122 (January 20th 2024)
+
+* XML Extensions: Added the ability to set how much stuff is required to build Discord lamps.
+ * Minimum amount of stuff is 100.
+ * Maximum amount of stuff is 1000.
+ * Default amount of stuff is 300.
+* XML Extensions: Added the ability to set the brightness of Discord lamps.
+ * Minimum brightness is 1.
+ * Maximum brightness is 20.
+ * Default brightness is 8.
+* Core: NPC faction settlements should now sell drugs (you will need to wait for them to restock).
+* Biotech: Fixed 'Could not resolve cross-reference: No RimWorld.XenotypeDef named MLRP_Xeno_Batpony found to give to RimWorld.XenotypeChance RimWorld.XenotypeChance' error, seen when Alpha Genes wasn't active.
+* Combat Extended: Reduced points awarded by the 'Wimbledon This Ain't' achievement to 50 (was 75).
+* Combat Extended: Reduced points awarded by the 'Hazardous Harmonious Materials' achievement to 50 (was 100).
+* Combat Extended: Reduced points awarded by the 'Splinters, Splinters Everywhere' achievement to 50 (was 100).
+* Combat Extended: Fixed 'Could not resolve cross-reference: No Verse.ThingDef named BlindSmoke found to give to CombatExtended.ProjectilePropertiesCE CombatExtended.ProjectilePropertiesCE' error.
+* Combat Extended: Fixed 'Verse.PatchOperationReplace(xpath="Defs/ThingDef[defName="MLRP_SweetieBotTurret"]/statBases/AccuracyTouch"): Failed to find a node with the given xpath' seen when XML Extensions was enabled.
+* Combat Extended: Fixed 'Verse.PatchOperationReplace(xpath="Defs/ThingDef[defName="MLRP_Weaponless"]/statBases/AccuracyTouch"): Failed to find a node with the given xpath' seen when XML Extensions was enabled.
+* Dubs Bad Hygiene: Changed the texture of the Pipp Petals plushie.
+* Dubs Bad Hygiene: Changed the texture of the 'Pipp, Pipp, Hooray!' achievement.
+* Vanilla Factions Expanded - Deserters: Halved the cost of acquiring intel from Spitfire, as well as how much you get.
+* Vanilla Factions Expanded - Deserters: Fixed being unable to acquire intel from Spitfire despite having the required items.
+ * Thanks to Wheat Tail for bringing this issue to my attention.
+* XML Extensions: Changing Nurse Redheart to spawn glitterworld medicine no longer increases her power consumption.
+
Version 4.45.109 (December 4th 2023)
* Core: Added Miss Harshwhinny.
diff --git a/MyLittleRimPony/About/Credits.txt b/MyLittleRimPony/About/Credits.txt
index ddf70bf2..70aeb588 100644
--- a/MyLittleRimPony/About/Credits.txt
+++ b/MyLittleRimPony/About/Credits.txt
@@ -27,7 +27,7 @@ Nurse Redheart: drfatalchunk (1464636)*
Izzy Moonbow (plush): inaactive (2561243)
Izzy Moonbow (smoke launcher): ejlightning007arts (2718787)
Pinkie Pie: flizzick (2490254)
-Pipp Petals: Unknown Artist (2700720)***
+Pipp Petals: ejlightning007arts (2762024)***
Princess Cadence: princesscaramelo (2115510)
Princess Celestia: killagouge (2058026)
Princess Luna: chrzanek97 (2124813)
diff --git a/MyLittleRimPony/About/Manifest.xml b/MyLittleRimPony/About/Manifest.xml
index e2363262..82b336a2 100644
--- a/MyLittleRimPony/About/Manifest.xml
+++ b/MyLittleRimPony/About/Manifest.xml
@@ -1,6 +1,6 @@
My Little RimPony
- 4.45.109
+ 4.47.122truehttps://raw.githubusercontent.com/GeodesicDragon/mylittlerimpony/main/MyLittleRimPony/About/Manifest.xmlhttps://github.com/geodesicdragon/mylittlerimpony/releases/latest
diff --git a/MyLittleRimPony/Alpha Genes/Defs/FactionDefs/MLP_Faction_Batpony.xml b/MyLittleRimPony/Alpha Genes/Defs/FactionDefs/MLP_Faction_Batpony.xml
new file mode 100644
index 00000000..00981964
--- /dev/null
+++ b/MyLittleRimPony/Alpha Genes/Defs/FactionDefs/MLP_Faction_Batpony.xml
@@ -0,0 +1,165 @@
+
+
+
+
+ MLRP_Batpony_Faction
+
+ Outlander
+ A colony of people who have undergone xenotype implantation to become batponies. Given that they have spent a lot of time by themselves, they are initially hostile towards outsiders, but they are willing to get over this if shown enough respect.\n\nIn combat, they employ the same mercenaries use by the other pony-themed faction which exists in the world, though the two don't get along.
+ true
+ batpony
+ batponies
+ 2
+ 1
+ 1
+ true
+ true
+ top bat
+ true
+ Things/Batpony
+
+
+ 1
+
+
+ MLRP_BronySettlementNames
+ MLRP_BronyNames
+ MLRP_BronySettlementNames
+
+
+
+ 1
+ 70
+
+
\ No newline at end of file
diff --git a/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_Batponies.xml b/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_Batponies.xml
index 00981964..6e42cd21 100644
--- a/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_Batponies.xml
+++ b/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_Batponies.xml
@@ -1,165 +1,6 @@
-
-
+
+
+
+
-
- MLRP_Batpony_Faction
-
- Outlander
- A colony of people who have undergone xenotype implantation to become batponies. Given that they have spent a lot of time by themselves, they are initially hostile towards outsiders, but they are willing to get over this if shown enough respect.\n\nIn combat, they employ the same mercenaries use by the other pony-themed faction which exists in the world, though the two don't get along.
- true
- batpony
- batponies
- 2
- 1
- 1
- true
- true
- top bat
- true
- Things/Batpony
-
-
- 1
-
-
- MLRP_BronySettlementNames
- MLRP_BronyNames
- MLRP_BronySettlementNames
-
-
Shining Armour: "Come on, gang! Are we gonna gallop, or are we gonna trot?!"
Spoiled Rich: "Honestly, if you're looking for somepony to fund-raise, I can bring in enough bits to have several buildings named after me."
Starlight Glimmer: "PHYLLIS, NO!"
+
Sunny Starscout: "We'll do our part. Hoof to heart."
Sunset Shimmer: "Am I the only one who thinks this is overkill?"
Sweetie Belle: "OH, COME ON!"
Sweetie Bot: "If this world isn't going to love me, I'll teach it to FEAR ME instead."
Twilight Sparkle: "I have to finish this report to the princess summarizing all my other reports to the princess."
Zephyr Breeze: "To be fair, it was never made specifically clear to me what 'guarding' actually means, so this is on you."
+
Plushie traders can be requested from most factions via the comms console.
The Orbital Friendship Cannon can be rearmed using 100 gold.
The wife thrower has slightly better long range accuracy than a pila, and can be thrown twice as fast.
@@ -43,17 +46,18 @@
Giving a Luna plush to a pawn with the 'quick sleeper' trait will make them rest twice as fast.
Giving a Cheerilee plush to a pawn with the 'fast learner' trait will help them improve their skills faster.
Giving a Starlight Glimmer plush to a pawn with the 'psychically hypersensitive' or 'psychically sensitive' traits will lower - or even eliminate - the mood penalty from psychic drones.
-
Giving a Sweetie Belle plush to a pawn with low Cooking skill should reduce the chance of your other pawns suffering food poisoning.
+
Giving a Sweetie Belle plush to a pawn with low Cooking skill will slightly reduce the chance of them poisoning meals.
Screwball generators can be built from pretty much any material, including wood.
Since Discord lamps don't require power, they are able to continue providing light during solar flares.
If you have the XML Extensions mod enabled, you can configure many parts of this mod to your liking, such as whether or not bronies can be violent and how many textiles you need to craft plushies.
-
Nurse Redheart is a rare reward from quests; she will grant you 5 Medicine every 10 days as long as she has 350W of power.
-
The Super Speedy Cider Squeezy 6000 is a rare reward from quests; it will grant you 30 Beer every 30 days as long as it has 500W of power.
+
Nurse Redheart is a rare reward from quests; she will grant you 5 Medicine every 10 days as long as she has enough power.
+
The Super Speedy Cider Squeezy 6000 is a rare reward from quests; it will grant you 30 Beer every 30 days as long as it has enough power.
Mudbriar, Quibble Pants and Zephyr Breeze turrets do no damage, but can help to distract raiders. They are, however, quite expensive to build.
The Fleur de Lis plush can be used to counter the effects of the 'ugly' traits.
The Nightmare Moon statue allows you to acquire many exotic items using silver, which is handy if your colonists lack the skills, though it does work out to be more expensive than acquiring them normally.
The Daybreaker statue lets you convert 100 steel, plasteel, uranium, jade or gold into the market value equivalent of another. She will also let you create components (regular and advanced) much faster than using a fabrication bench, but bear in mind that chemfuel is required for everything she does.
-
Poison joke will affect a pawns consciousness, moving, manipulation, talking, eating, sight, hearing, breathing, blood filtration or blood pumping in either a positive or negative way.
+
Poison joke will affect a pawns consciousness, moving, manipulation, talking, eating, sight, hearing or breathing in either a positive or negative way.
+
Poison joke has a chance of inflicting a pawn with the Cutie Pox.
diff --git a/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml b/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml
index 00129e87..37762b68 100644
--- a/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml
+++ b/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml
@@ -45,5 +45,6 @@
XML Extensions has been detected.Combat Extended has been detected.IMPORTANT: I don't use CE, so patches for it are untested; please alert me ASAP if you encounter any problems!
+ Medieval Overhaul patches have been applied.
\ No newline at end of file
diff --git a/MyLittleRimPony/Core/Patches/Vanilla Factions Expanded - Vikings/FabricExchange_VFEVMaterials.xml b/MyLittleRimPony/Core/Patches/Vanilla Factions Expanded - Vikings/FabricExchange_VFEVMaterials.xml
deleted file mode 100644
index bf7daf41..00000000
--- a/MyLittleRimPony/Core/Patches/Vanilla Factions Expanded - Vikings/FabricExchange_VFEVMaterials.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
Vanilla Factions Expanded - Vikings
-
-
- Defs
-
-
-
- MLRP_FE_VFEV_Leather_Fenrir
-
- Use silver to purchase 100 fenrirskin.
-
-
-
-
- Defs
-
-
- MLRP_NMM_VFEV_PlantGrowerArtifact
-
- Offer silver in exchange for a psychic cornucopia.
- AdvancedFabrication
- Making an offering to Nightmare Moon
- GeneralLaborSpeed
- Crafting
- Cremate
- Recipe_Cremate
- false
- 300
-
-
MLRP_NightmareMoon
-
-
-
-
-
-
Silver
-
-
- 88
-
-
-
- 1
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MyLittleRimPony/Dubs Bad Hygiene/Patches/My Little RimPony/PippQuote.xml b/MyLittleRimPony/Dubs Bad Hygiene/Patches/My Little RimPony/PippQuote.xml
new file mode 100644
index 00000000..2583a343
--- /dev/null
+++ b/MyLittleRimPony/Dubs Bad Hygiene/Patches/My Little RimPony/PippQuote.xml
@@ -0,0 +1,10 @@
+
+
+
+ Defs/TipSetDef[defName="MyLittleRimPony_Tips"]/tips
+
+
Pipp Petals: "My sparkle is aquamarine? That's, like, my sixth favorite color!"
+
+
+
+
\ No newline at end of file
diff --git a/MyLittleRimPony/Dubs Bad Hygiene/Textures/Achievements/PippPippHooray.png b/MyLittleRimPony/Dubs Bad Hygiene/Textures/Achievements/PippPippHooray.png
index 3510e9e6..e6f0140b 100644
Binary files a/MyLittleRimPony/Dubs Bad Hygiene/Textures/Achievements/PippPippHooray.png and b/MyLittleRimPony/Dubs Bad Hygiene/Textures/Achievements/PippPippHooray.png differ
diff --git a/MyLittleRimPony/Dubs Bad Hygiene/Textures/Things/PonyPlush/PippPetals.png b/MyLittleRimPony/Dubs Bad Hygiene/Textures/Things/PonyPlush/PippPetals.png
index 2ef1038c..02ab6b6a 100644
Binary files a/MyLittleRimPony/Dubs Bad Hygiene/Textures/Things/PonyPlush/PippPetals.png and b/MyLittleRimPony/Dubs Bad Hygiene/Textures/Things/PonyPlush/PippPetals.png differ
diff --git a/MyLittleRimPony/LoadFolders.xml b/MyLittleRimPony/LoadFolders.xml
index 4c5c26b7..f4b4294b 100644
--- a/MyLittleRimPony/LoadFolders.xml
+++ b/MyLittleRimPony/LoadFolders.xml
@@ -11,6 +11,7 @@
Vanilla Backgrounds Expanded
Vanilla Backstories Expanded
Vanilla Factions Expanded/Deserters
+
Vanilla Factions Expanded/Vikings
Vanilla Outposts Expanded
XML Extensions
Combat Extended
diff --git a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v16/.suo b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v16/.suo
index d4a18d3a..a9db3a6d 100644
Binary files a/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v16/.suo and b/MyLittleRimPony/Source/.vs/MLRP_Assemblies/v16/.suo differ
diff --git a/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs b/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs
index 788543aa..77f3e90b 100644
--- a/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs
+++ b/MyLittleRimPony/Source/MLRP_ResearchNotifications.cs
@@ -41,10 +41,10 @@ public class MLRP_ResearchTracker : GameComponent
"FleshShaping",
"ArtificialMetabolism",
"CircadianInfluence",
- "StandardMechtech",
- "HighMechtech",
- "UltraMechtech",
- "Deathrest",
+ "StandardMechtech", // Biotech
+ "HighMechtech", // Biotech
+ "UltraMechtech", // Biotech
+ "Deathrest", // Biotech
"ToxFiltration",
"MLRP_MagicMirrorResearch", // My Little RimPony
"MLRP_ArchotechResearch", // My Little RimPony
diff --git a/MyLittleRimPony/Source/MyLittleRimPony.cs b/MyLittleRimPony/Source/MyLittleRimPony.cs
index 81143d42..101f9c47 100644
--- a/MyLittleRimPony/Source/MyLittleRimPony.cs
+++ b/MyLittleRimPony/Source/MyLittleRimPony.cs
@@ -67,6 +67,10 @@ static MyDefOf()
{
Log.Message("[" + "MLRP_ModName".Translate() + "] " + "MLRP_XMLExtensionsDetected".Translate());
}
+ if (ModsConfig.IsActive("geodesicdragon.rimpony.medieval"))
+ {
+ Log.Message("[" + "MLRP_ModName".Translate() + "] " + "MLRP_MOPatchesDetected".Translate());
+ }
}
}
diff --git a/MyLittleRimPony/Source/Properties/AssemblyInfo.cs b/MyLittleRimPony/Source/Properties/AssemblyInfo.cs
index fc317467..956c5351 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("4.45.109.0")]
-[assembly: AssemblyFileVersion("4.45.109.0")]
+[assembly: AssemblyVersion("4.47.122.0")]
+[assembly: AssemblyFileVersion("4.47.122.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 10b14001..4792c037 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 9b6d15be..3d2479f9 100644
Binary files a/MyLittleRimPony/Source/obj/Debug/MyLittleRimPony.dll and b/MyLittleRimPony/Source/obj/Debug/MyLittleRimPony.dll differ
diff --git a/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Defs/RecipeDefs/IntelRequest.xml b/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Defs/RecipeDefs/IntelRequest.xml
index 02e5d504..7926bc7c 100644
--- a/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Defs/RecipeDefs/IntelRequest.xml
+++ b/MyLittleRimPony/Vanilla Factions Expanded/Deserters/Defs/RecipeDefs/IntelRequest.xml
@@ -21,7 +21,7 @@
Nurse Redheart is a rare reward from quests; she will grant you {MLRP_NurseRedheartMedicineSpawnAmount} Medicine every {MLRP_NurseRedheartMedicineSpawnTime} days as long as she has 350W of power.
+
Nurse Redheart is a rare reward from quests; she will grant you {MLRP_NurseRedheartMedicineSpawnAmount} Medicine every {MLRP_NurseRedheartMedicineSpawnTime} days as long as she has enough power.
@@ -569,7 +657,7 @@
10
- Defs/ThingDef[defName="MLRP_Weaponless"]/verbs/li/range
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/verbs/li/range{MLRP_ZephyrBreezeAggroRange}
@@ -598,11 +686,28 @@
MLRP_AggroTurretAccuracyTouch0.1
-
- Defs/ThingDef[defName="MLRP_Weaponless"]/statBases/AccuracyTouch
-
- {MLRP_AggroTurretAccuracyTouch}
-
+
+
+
CETeam.CombatExtended
+
+ true
+ and
+
+
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/statBases/AimingAccuracy
+
+ {MLRP_AggroTurretAccuracyTouch}
+
+
+
+
+
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/statBases/AccuracyTouch
+
+ {MLRP_AggroTurretAccuracyTouch}
+
+
+
@@ -613,11 +718,28 @@
MLRP_AggroTurretAccuracyShort0.25
-
- Defs/ThingDef[defName="MLRP_Weaponless"]/statBases/AccuracyShort
-
- {MLRP_AggroTurretAccuracyShort}
-
+
+
+
CETeam.CombatExtended
+
+ true
+ and
+
+
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/statBases/AimingAccuracy
+
+ {MLRP_AggroTurretAccuracyShort}
+
+
+
+
+
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/statBases/AccuracyShort
+
+ {MLRP_AggroTurretAccuracyShort}
+
+
+
@@ -629,11 +751,28 @@
MLRP_AggroTurretAccuracyMedium0.25
-
- Defs/ThingDef[defName="MLRP_Weaponless"]/statBases/AccuracyMedium
-
- {MLRP_AggroTurretAccuracyMedium}
-
+
+
+
CETeam.CombatExtended
+
+ true
+ and
+
+
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/statBases/AimingAccuracy
+
+ {MLRP_AggroTurretAccuracyMedium}
+
+
+
+
+
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/statBases/AccuracyMedium
+
+ {MLRP_AggroTurretAccuracyMedium}
+
+
+
@@ -644,11 +783,28 @@
MLRP_AggroTurretAccuracyLong1
-
- Defs/ThingDef[defName="MLRP_Weaponless"]/statBases/AccuracyLong
-
- {MLRP_AggroTurretAccuracyLong}
-
+
+
+
CETeam.CombatExtended
+
+ true
+ and
+
+
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/statBases/AimingAccuracy
+
+ {MLRP_AggroTurretAccuracyLong}
+
+
+
+
+
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/statBases/AccuracyLong
+
+ {MLRP_AggroTurretAccuracyLong}
+
+
+
@@ -660,7 +816,7 @@
3
- Defs/ThingDef[defName="MLRP_Weaponless"]/verbs/li/burstShotCount
+ Defs/ThingDef[defName="MLRP_Mudbriar" or defName="MLRP_QuibblePants" or defName="MLRP_ZephyrBreeze" or defName="MLRP_Weaponless"]/verbs/li/burstShotCount{MLRP_AggroTurretBurstAmount}
@@ -744,7 +900,7 @@
Defs/TipSetDef[defName="MyLittleRimPony_Tips"]/tips/li[@Name="SSCS6K"]
-
The Super Speedy Cider Squeezy 6000 is a rare reward from quests; it will grant you {MLRP_SSCS6KBeerSpawnAmount} Beer every {MLRP_SSCS6KBeerSpawnTime} days as long as it has 500W of power.
+
The Super Speedy Cider Squeezy 6000 is a rare reward from quests; it will grant you {MLRP_SSCS6KBeerSpawnAmount} Beer every {MLRP_SSCS6KBeerSpawnTime} days as long as it has enough power.