Version 4.60.236

See release.
GeodesicDragon · Mar 9, 2024 · 66c6347 · 66c6347
1 parent ff9d4ca
commit 66c6347
Show file tree

Hide file tree

Showing 49 changed files with 647 additions and 281 deletions.
diff --git a/MyLittleRimPony/About/About.xml b/MyLittleRimPony/About/About.xml
@@ -3,7 +3,7 @@
 	<author>GeodesicDragon</author>
 	<packageId>geodesicdragon.rimpony</packageId>
 	<url>https://discord.gg/BGKnpza</url>
-	<modVersion>4.53.215</modVersion>
+	<modVersion>4.60.236</modVersion>
 	<supportedVersions>
 		<li>1.4</li>
 	</supportedVersions>

diff --git a/MyLittleRimPony/About/Changelog.txt b/MyLittleRimPony/About/Changelog.txt
@@ -1,3 +1,49 @@
+Version 4.60.236 (March 9th 2024)
+
+* [SYR] Trait Value: Added values for the brony and anti brony traits.
+	* Brony trait has a value of +10 because of the boost to social skills.
+	* Anti brony trait has a value of 0 because it only affects how the pawn interacts with bronies.
+* Combat Extended: Added research which unlocks the ability to craft Cadence javelins, tennis balls, harmony lasers and wooden bullets.
+	* Can be done at a simple research bench.
+	* Does not require you to research anything else first.
+	* Handy if you get hold of a weapon before you can actually craft it yourself.
+* Mechanitor Command Range Extenders: Added two new recipes to the Nightmare Moon statue.
+	* Request command uplink: 1000 silver and 6 components. Unlocked once standard mechtech is researched.
+	* Request command uplink (high): 2000 silver, 3 components and 3 advanced components. Unlocked once high mechtech is researched.
+* XML Extensions: Added an option to set whether or not the anima tree is turned into the tree of harmony. Set to true by default. (1)
+* XML Extensions: Added the ability to set how much stuff is required to build Screwballs.
+	* Minimum amount of stuff is 100.
+	* Maximum amount of stuff is 1000.
+	* Default amount of stuff is 300.
+	* Does not affect how much power is generated.
+* Core: Miss Pommel no longer sells human leather. Instead, the recipe has been changed to let you convert 100 human leather into the market value equivalent of cloth.
+* Core: Renamed 'magical power increase' research to 'magical power efficiency.'
+* Core: Screwballs will now output 50% more power once you research magical power efficiency (was 25%).
+* Core: Researching magical power efficiency will now affect the power consumption of other buildings.
+	* Plushie bench: 50% less power.
+	* Fabric Exchange: 50% less power.
+	* Stone Exchange: 50% less power.
+	* Sweetie Bot turret: 25% less power.
+	* Nurse Redheart: 25% less power.
+	* Super Speedy Cider Squeezy 6000: 25% less power.
+* Core: Unlocking the ability to request resurrector mech serums from Nightmare Moon no longer requires research, but the price has been doubled.
+* Core: You are no longer required to have the NPC faction present when starting a new colony. (2)
+* Core: Tweaked the large portrait of Sunny Starscout so that it no longer looks stretched.
+* Core: Replaced the small portrait of Sunny Starscout with a new one.
+* Ideology: Fixed the texture on the villain statue not displaying correctly.
+* Biotech: Reduced the time needed for a mechanitor to take control of Sweetie Bot mechanoids to 3 seconds (was 6).
+* Biotech: The Empire is no longer permanently hostile to the renegade alicorn faction.
+* Biotech: The Renegade Alicorn scenario now starts with Screwball research already unlocked.
+* Biotech: The Renegade Alicorn scenario now starts with Evil Sisters research already unlocked.
+* Biotech: You are no longer required to have the diamond dog faction present when starting a new colony. (2)
+* Alpha Genes: You are no longer required to have the batpony faction present when starting a new colony. (2)
+* Combat Extended: Fixed Sweetie Bot mechanoids showing as not having any armour.
+
+1. The anima tree has returned to normal; it will only be changed if you have XML Extensions and keep the option enabled.
+2. If you want this faction in your game, you will have to add it manually during map generation.
+
+Special thanks to Le_Me from the Steam Workshop for suggesting both of the above changes.
+
 Version 4.53.215 (February 4th 2024)
 
 * Biotech: Added three new recipes to the Nightmare Moon statue to request signal, powerfocus and nano structuring chips in exchange for silver.

diff --git a/MyLittleRimPony/About/Credits.txt b/MyLittleRimPony/About/Credits.txt
@@ -108,7 +108,7 @@ Tennis ball: Taken from art by greenhoof (2560819)
 STORYTELLERS
 
 Sunny Starscout (background): Unknown Artist (3106126)
-Sunny Starscout (tiny): Unknown Artist (2700716)
+Sunny Starscout (tiny): cheezedoodle96 (2809795)
 
 OTHER IMAGES
 

diff --git a/MyLittleRimPony/About/Manifest.xml b/MyLittleRimPony/About/Manifest.xml
@@ -1,6 +1,6 @@
 <Manifest>
 	<identifier>My Little RimPony</identifier>
-	<version>4.53.215</version>
+	<version>4.60.236</version>
 	<showCrossPromotions>true</showCrossPromotions>
 	<manifestUri>https://raw.githubusercontent.com/GeodesicDragon/mylittlerimpony/main/MyLittleRimPony/About/Manifest.xml</manifestUri>
 	<downloadUri>https://github.com/geodesicdragon/mylittlerimpony/releases/latest</downloadUri>

diff --git a/MyLittleRimPony/Alpha Genes/Defs/FactionDefs/MLP_Faction_Batpony.xml b/MyLittleRimPony/Alpha Genes/Defs/FactionDefs/MLP_Faction_Batpony.xml
@@ -10,8 +10,11 @@
     <pawnSingular>batpony</pawnSingular>
     <pawnsPlural>batponies</pawnsPlural>
     <settlementGenerationWeight>2</settlementGenerationWeight>
-    <requiredCountAtGameStart>1</requiredCountAtGameStart>
-    <maxCountAtGameStart>1</maxCountAtGameStart>
+    <requiredCountAtGameStart>0</requiredCountAtGameStart>
+    <startingCountAtWorldCreation>0</startingCountAtWorldCreation>
+    <maxCountAtGameStart>0</maxCountAtGameStart>
+    <maxConfigurableAtWorldCreation>1</maxConfigurableAtWorldCreation>
+    <configurationListOrderPriority>70</configurationListOrderPriority>
     <canSiege>true</canSiege>
     <canStageAttacks>true</canStageAttacks>
     <leaderTitle>top bat</leaderTitle>
@@ -159,7 +162,5 @@
 		</options>
       </li>
     </pawnGroupMakers>
-    <maxConfigurableAtWorldCreation>1</maxConfigurableAtWorldCreation>
-    <configurationListOrderPriority>70</configurationListOrderPriority>
   </FactionDef>
 </Defs>
diff --git a/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_DiamondDogs.xml b/MyLittleRimPony/Biotech/Defs/FactionDefs/MLP_Faction_DiamondDogs.xml
@@ -10,8 +10,11 @@
     <pawnSingular>Diamond Dog</pawnSingular>
     <pawnsPlural>Diamond Dogs</pawnsPlural>
     <settlementGenerationWeight>2</settlementGenerationWeight>
-    <requiredCountAtGameStart>1</requiredCountAtGameStart>
-    <maxCountAtGameStart>1</maxCountAtGameStart>
+    <requiredCountAtGameStart>0</requiredCountAtGameStart>
+    <startingCountAtWorldCreation>0</startingCountAtWorldCreation>
+    <maxCountAtGameStart>0</maxCountAtGameStart>
+    <maxConfigurableAtWorldCreation>1</maxConfigurableAtWorldCreation>
+    <configurationListOrderPriority>70</configurationListOrderPriority>
     <canSiege>false</canSiege>
     <canStageAttacks>true</canStageAttacks>
     <leaderTitle>alpha</leaderTitle>
@@ -105,8 +108,6 @@
 		</options>
       </li>
     </pawnGroupMakers>
-    <maxConfigurableAtWorldCreation>1</maxConfigurableAtWorldCreation>
-    <configurationListOrderPriority>70</configurationListOrderPriority>
   </FactionDef>
 
   <ThingSetMakerDef>

diff --git a/MyLittleRimPony/Biotech/Defs/Mechanoid/SweetieBotMechanoid_Base.xml b/MyLittleRimPony/Biotech/Defs/Mechanoid/SweetieBotMechanoid_Base.xml
@@ -1,22 +1,7 @@
 <Defs>
 
-<ThingDef ParentName="BasePawn" Name="MLRP_SweetieBot_MechanoidBase" Abstract="True"> <!--Name="BaseMechanoid"-->
+<ThingDef ParentName="BasePawn" Name="MLRP_SweetieBot_MechanoidBase" Abstract="True">
     <soundImpactDefault>BulletImpact_Metal</soundImpactDefault>
-    <statBases>
-      <MarketValue>1200</MarketValue>
-      <PsychicSensitivity>0.5</PsychicSensitivity>
-      <ToxicResistance>1</ToxicResistance>
-      <Flammability>0</Flammability>
-      <ComfyTemperatureMin>-100</ComfyTemperatureMin>
-      <ComfyTemperatureMax>250</ComfyTemperatureMax>
-      <MeatAmount>0</MeatAmount>
-      <ArmorRating_Heat>2.00</ArmorRating_Heat>
-      <ControlTakingTime>6</ControlTakingTime>
-      <ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
-      <MechEnergyLossPerHP>0.33</MechEnergyLossPerHP>
-      <WastepacksPerRecharge>5</WastepacksPerRecharge>
-      <WorkSpeedGlobal>0.5</WorkSpeedGlobal>
-    </statBases>
     <receivesSignals>true</receivesSignals>
     <tradeability>None</tradeability>
     <race>

diff --git a/MyLittleRimPony/Biotech/Defs/Mechanoid/SweetieBot_Mechanoid.xml b/MyLittleRimPony/Biotech/Defs/Mechanoid/SweetieBot_Mechanoid.xml
@@ -18,7 +18,19 @@
 			<BandwidthCost>3</BandwidthCost>
 			<ArmorRating_Blunt>0.1</ArmorRating_Blunt>
 			<ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+			<ArmorRating_Heat>2.00</ArmorRating_Heat>
 			<CaravanRidingSpeedFactor>1.6</CaravanRidingSpeedFactor>
+			<PsychicSensitivity>0.5</PsychicSensitivity>
+			<ToxicResistance>1</ToxicResistance>
+			<Flammability>0</Flammability>
+			<ComfyTemperatureMin>-100</ComfyTemperatureMin>
+			<ComfyTemperatureMax>250</ComfyTemperatureMax>
+			<MeatAmount>0</MeatAmount>
+			<ControlTakingTime>3</ControlTakingTime>
+			<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
+			<MechEnergyLossPerHP>0.33</MechEnergyLossPerHP>
+			<WastepacksPerRecharge>5</WastepacksPerRecharge>
+			<WorkSpeedGlobal>0.5</WorkSpeedGlobal>
 		</statBases>
 		<race>
 			<body>MLRP_SweetieBotMech</body>

diff --git a/MyLittleRimPony/Biotech/Defs/Scenarios/MLP_RenegadeAlicornScenario.xml b/MyLittleRimPony/Biotech/Defs/Scenarios/MLP_RenegadeAlicornScenario.xml
@@ -50,6 +50,16 @@ You managed to convince a few people to follow you and now, with nothing but the
 				<method>Standing</method>
 			</li>
 
+			<li Class="ScenPart_StartingResearch">
+				<def>StartingResearch</def>
+				<project>MLRP_ScrewballResearch</project>
+			</li>
+
+			<li Class="ScenPart_StartingResearch">
+				<def>StartingResearch</def>
+				<project>MLRP_NightmareMoonResearch</project>
+			</li>	
+
 			<!--Starting items-->
 
 			<li Class="ScenPart_StartingThing_Defined">

diff --git a/...y/Biotech/Patches/Mechanitor Command Range Extenders/NMM_RequestCommandRangeExtenders.xml b/...y/Biotech/Patches/Mechanitor Command Range Extenders/NMM_RequestCommandRangeExtenders.xml
@@ -0,0 +1,98 @@
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Mechanitor Command Range Extenders</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs</xpath>
+			<value>
+
+				<RecipeDef ParentName="NMM_MechanitorOnlyRecipe">
+					<defName>MLRP_NMM_Hydroxyapatite_CommandSublink</defName>
+					<label>request command sublink</label>
+					<description>Offer silver and other items in exchange for a command sublink.\n\nThis recipe can only be performed by a mechanitor.</description>
+					<jobString>Making an offering to Nightmare Moon</jobString>
+					<researchPrerequisite>StandardMechtech</researchPrerequisite>
+					<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+					<workSkill>Crafting</workSkill>
+					<effectWorking>Cremate</effectWorking>
+					<soundWorking>Recipe_Cremate</soundWorking>
+					<allowMixingIngredients>false</allowMixingIngredients>
+					<workAmount>300</workAmount>
+					<recipeUsers>
+						<li>MLRP_NightmareMoon</li>
+					</recipeUsers>
+					<ingredients>
+						<li>
+							<filter>
+								<thingDefs>
+									<li>Silver</li>
+								</thingDefs>
+							</filter>
+							<count>100</count>
+						</li>
+						<li>
+							<filter>
+								<thingDefs>
+									<li>ComponentIndustrial</li>
+								</thingDefs>
+							</filter>
+							<count>6</count>
+						</li>
+					</ingredients>
+					<products>
+						<Hydroxyapatite_CommandSublink>1</Hydroxyapatite_CommandSublink>
+					</products>
+				</RecipeDef>
+
+				<RecipeDef ParentName="NMM_MechanitorOnlyRecipe">
+					<defName>MLRP_NMM_Hydroxyapatite_CommandSublinkHigh</defName>
+					<label>request command sublink (high)</label>
+					<description>Offer silver and other items in exchange for a command sublink (high).\n\nThis recipe can only be performed by a mechanitor.</description>
+					<jobString>Making an offering to Nightmare Moon</jobString>
+					<researchPrerequisite>HighMechtech</researchPrerequisite>
+					<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+					<workSkill>Crafting</workSkill>
+					<effectWorking>Cremate</effectWorking>
+					<soundWorking>Recipe_Cremate</soundWorking>
+					<allowMixingIngredients>false</allowMixingIngredients>
+					<workAmount>300</workAmount>
+					<recipeUsers>
+						<li>MLRP_NightmareMoon</li>
+					</recipeUsers>
+					<ingredients>
+						<li>
+							<filter>
+								<thingDefs>
+									<li>Silver</li>
+								</thingDefs>
+							</filter>
+							<count>200</count>
+						</li>
+						<li>
+							<filter>
+								<thingDefs>
+									<li>ComponentIndustrial</li>
+								</thingDefs>
+							</filter>
+							<count>3</count>
+						</li>
+						<li>
+							<filter>
+								<thingDefs>
+									<li>ComponentSpacer</li>
+								</thingDefs>
+							</filter>
+							<count>3</count>
+						</li>
+					</ingredients>
+					<products>
+						<Hydroxyapatite_CommandSublinkHigh>1</Hydroxyapatite_CommandSublinkHigh>
+					</products>
+				</RecipeDef>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
diff --git a/MyLittleRimPony/Biotech/Patches/Royalty/RenegadeAlicornIsNotHostileToEmpire.xml b/MyLittleRimPony/Biotech/Patches/Royalty/RenegadeAlicornIsNotHostileToEmpire.xml
@@ -0,0 +1,13 @@
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Royalty</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>/Defs/FactionDef[defName="Empire"]/permanentEnemyToEveryoneExcept</xpath>
+			<value>
+				<li>MLRP_RenegadeAlicornFaction</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>
diff --git a/MyLittleRimPony/Combat Extended/Defs/Ammo/CadenceJavelins.xml b/MyLittleRimPony/Combat Extended/Defs/Ammo/CadenceJavelins.xml
@@ -61,6 +61,7 @@
 		<products>
 			<Ammo_CadenceJavelins>100</Ammo_CadenceJavelins>
 		</products>
+		<researchPrerequisite>MLRP_CE_AmmoResearch</researchPrerequisite>
 	</RecipeDef>
 
 </Defs>
diff --git a/MyLittleRimPony/Combat Extended/Defs/Ammo/RainbowLasers.xml b/MyLittleRimPony/Combat Extended/Defs/Ammo/RainbowLasers.xml
@@ -82,7 +82,7 @@
 		<products>
 			<Ammo_HarmonyLaser>500</Ammo_HarmonyLaser>
 		</products>
-		<researchPrerequisite>MLRP_WeaponisedElementsResearch</researchPrerequisite>
+		<researchPrerequisite>MLRP_CE_AmmoResearch</researchPrerequisite>
 	</RecipeDef>
 
 </Defs>
diff --git a/MyLittleRimPony/Combat Extended/Defs/Ammo/TennisBalls.xml b/MyLittleRimPony/Combat Extended/Defs/Ammo/TennisBalls.xml
@@ -81,6 +81,7 @@
 		<products>
 			<Ammo_TennisBalls>50</Ammo_TennisBalls>
 		</products>
+		<researchPrerequisite>MLRP_CE_AmmoResearch</researchPrerequisite>
 	</RecipeDef>
 
 </Defs>
diff --git a/MyLittleRimPony/Combat Extended/Defs/Ammo/WoodenBullets.xml b/MyLittleRimPony/Combat Extended/Defs/Ammo/WoodenBullets.xml
@@ -67,6 +67,7 @@
 		<products>
 			<Ammo_WoodenBullets>300</Ammo_WoodenBullets>
 		</products>
+		<researchPrerequisite>MLRP_CE_AmmoResearch</researchPrerequisite>
 	</RecipeDef>
 
 </Defs>
diff --git a/MyLittleRimPony/Combat Extended/Defs/ResearchProjectDefs/MLRP_ResearchCE.xml b/MyLittleRimPony/Combat Extended/Defs/ResearchProjectDefs/MLRP_ResearchCE.xml
@@ -0,0 +1,14 @@
+<Defs>
+
+<!--SCREWBALL-->
+
+	<ResearchProjectDef ParentName="MLRP_QuickResearchBase">
+		<defName>MLRP_CE_AmmoResearch</defName>
+		<label>magical ammunition</label>
+		<description>Unlocks the ability to craft pony-themed ammunition.</description>
+		<tab>MLRP_ResearchTab</tab>
+		<researchViewX>4</researchViewX>
+		<researchViewY>0</researchViewY>
+	</ResearchProjectDef>
+
+</Defs>
diff --git a/MyLittleRimPony/Combat Extended/Patches/SweetieBotMechanoidPatches.xml b/MyLittleRimPony/Combat Extended/Patches/SweetieBotMechanoidPatches.xml
@@ -13,15 +13,7 @@
 						</li>
 					</value>
 				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="MLRP_SweetieBotMech"]/statBases</xpath>
-					<value>
-						<AimingAccuracy>1.0</AimingAccuracy>
-						<ShootingAccuracyPawn>1.75</ShootingAccuracyPawn>
-					</value>
-				</li>
-
+
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[@Name="MLRP_SweetieBot_MechanoidBase"]/comps</xpath>
 					<value>