Version 6.9.56

See release.

MyLittleRimPony/About/About.xml

@@ -3,7 +3,7 @@
 	<author>GeodesicDragon</author>
 	<packageId>geodesicdragon.rimpony</packageId>
 	<url>https://discord.gg/BGKnpza</url>
-	<modVersion>6.5.23</modVersion>
+	<modVersion>6.9.56</modVersion>
 	<supportedVersions>
 		<li>1.5</li>
 	</supportedVersions>

MyLittleRimPony/About/Changelog.txt

@@ -1,3 +1,49 @@
+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.
+	* 15 base damage, 180 speed, 64 sharp armour penetration and 114 blunt armour penetration.
+	* Crafted in batches of 500 using 40 steel and 20 uranium.
+	* Recipe is unlocked after magical ammunition is researched.
+* Dubs Bad Hygiene: Added two new recipes to the Nightmare Moon statue to request bionic bladders and hygiene enhancers for 2000 silver each.
+* Vanilla Achievements Expanded: Added an achievement to stockpile 10,000 rounds of Sabot harmony lasers.
+* Core: Herbal cure kits now have a 10% chance of curing the plague.
+* Core: Split the Daybreaker tip into two separate entries, as the original was too long to be displayed properly.
+* Core: Fixed being able to make poison joke joints before researching drug production.
+* Core: Increased the number of herbal cure kits produced at a time to 2 (was 1).
+* Core: Increased combat power of elite brony mercenaries to 100 (was 50).
+* Biotech: Researching how to gestate Sweetie Bot mechanoids now requires standard mechtech (was high). This is a change I forgot to make when I changed their gestation recipe to use standard subcores instead of high subcores.
+* Biotech: Requesting deathrest capacity serums from Nightmare Moon no longer requires hemogen, but the silver cost is now 2000 (was 1250).
+* Anomaly: The texture for Thingpone now remains the same regardless of which direction it is rotated.
+* Combat Extended: Rainbow Dash now reduces suppressability by 5% on top of her other bonuses.
+* Combat Extended: Fixed 'Config error in MLRP_WeaponisedArrogance: is a bullet but has no damageDef' error.
+* Combat Extended: Increased sharp piercing of AP harmony lasers to 32 (was 25). (1)
+* Combat Extended: Increased blunt piercing of AP harmony lasers to 58 (was 35). (1)
+* Combat Extended: AP harmony lasers now have a speed rating of 151. (1)
+* Combat Extended: Fixed NPC faction settlements, bulk goods traders and combat suppliers not stocking Cadence javelins. (2)
+* Combat Extended: Fixed NPC faction settlements, bulk goods traders and combat suppliers not stocking harmony lasers. (2)
+* Combat Extended: Fixed NPC faction settlements, bulk goods traders and combat suppliers not stocking tennis balls. (2)
+* Combat Extended: Fixed NPC faction settlements, bulk goods traders and combat suppliers not stocking wooden bullets. (2)
+* Combat Extended: Fixed Sweetie Bot mechanoids being unable to see in the dark.
+* Combat Extended/Vanilla Achievements Expanded: Updated the texture of the 'A Whole Lotta Love' achievement to be less blurry.
+* Combat Extended/Vanilla Achievements Expanded: Updated the texture of the 'Wimbledon This Ain't' achievement to be less blurry.
+* Combat Extended/Vanilla Achievements Expanded: Updated the texture of the 'Hazardous Harmonious Materials' achievement to be less blurry.
+* Combat Extended/Vanilla Achievements Expanded: Updated the texture of the 'Splinters, Splinters Everywhere' achievement to be less blurry.
+* Combat Extended/Vanilla Achievements Expanded: Reduced the points value of the 'A Whole Lotta Love' achievement to 10 (was 50).
+* Combat Extended/Vanilla Achievements Expanded: Reduced the points value of the 'Wimbledon This Ain't' achievement to 20 (was 50).
+* Combat Extended/Vanilla Achievements Expanded: Reduced the points value of the 'Hazardous Harmonious Materials' achievement to 25 (was 50).
+* Combat Extended/Vanilla Achievements Expanded: Reduced the points value of the 'Splinters, Splinters Everywhere' achievement to 10 (was 50).
+* Combat Extended/Vanilla Achievements Expanded: Moved ammo related achievements to the 'MLRP - Weapons' tab.
+* Vanilla Achievements Expanded: Changed the texture of the 'Special Delivery!' achievement.
+* Vanilla Factions Expanded - Deserters: The texture for Spitfire now remains the same regardless of which direction it is rotated.
+* Vanilla Recycling Expanded: Fixed incorrect job string for the make trashbrick recipe at the Daybreaker statue.
+* XML Extensions: Removed the ability to change the range of aggro turrets. (3)
+* XML Extensions: Removed the ability to change the accuracy of aggro turrets. (3)
+* XML Extensions: Removed the ability to change the shots fired per burst of aggro turrets. (3)
+
+1. This change should put AP harmony lasers on par with AP charged rifle ammo.
+2. You may need to wait for a restock or a fresh trade caravan.
+3. This was causing some weird things to happen with Combat Extended. You'll have a ton of unused variables to get rid of.
+
 Version 6.5.23 (October 11th 2024)
 
 * Higher Power: Added a patch which will increase the power output of Screwballs by an additional 10% once advanced power is researched.

MyLittleRimPony/About/Credits.txt

@@ -1,4 +1,4 @@
-All art was sourced from Derpibooru (https://www.derpibooru.org), unless otherwise specified, and is used under a Creative Commons Attribution-Noncommercial-No Derivative Works 3.0 License; artist credit is followed by the Derpibooru image ID.
+Unless otherwise specified, all art was sourced from Derpibooru (https://www.derpibooru.org), and is used under a Creative Commons Attribution-Noncommercial-No Derivative Works 3.0 License; artist credit is followed by the Derpibooru image ID.
 
 If you are one of the artists listed below and want me to stop using your work, get in touch with me via my Discord server. Please be aware that you will need to prove that you are who you say you are before I will respond to your request.
 
@@ -17,21 +17,21 @@ Cheerilee: juniberries (2527617)
 Daring Do: sketchmcreations (1215272)
 Daybreaker: drakizora (1442272)
 Discord (plush): chrzanek97 (2584926)
-Discord (lamp): cloudyglow (1372861)**
+Discord (lamp): cloudyglow (1372861) **
 Fleur de Lis: darkoverlords (2768057)
 Fluttershy: RainbowCrab (2508169)
 Maud Pie: thebosscamacho (2819795)
-Nightmare Moon: Unknown Artist (2773794)*
+Nightmare Moon: Unknown Artist (2773794) *
 Nurse Haywick: GraphiteSketch AKA Timsplosion (1852562)
-Nurse Redheart: drfatalchunk (1464636)*
+Nurse Redheart: drfatalchunk (1464636) *
 Izzy Moonbow (plush): inaactive (2561243)
 Izzy Moonbow (smoke launcher): ejlightning007arts (2718787)
 Pinkie Pie: flizzick (2490254)
-Pipp Petals: ejlightning007arts (2762024)***
+Pipp Petals: ejlightning007arts (2762024) ***
 Princess Cadence: princesscaramelo (2115510)
 Princess Celestia: killagouge (2058026)
 Princess Luna: chrzanek97 (2124813)
-Rainbow Dash: TheMightyShizam (2501021)*
+Rainbow Dash: TheMightyShizam (2501021) *
 Rarity: MoongazePonies (2734969)
 Screwball: vexorb (32017)
 Scootaloo: sketchmcreations (1551560)
@@ -40,13 +40,13 @@ Shining Armour (wife thrower): keanno (148650)
 Shining Armour (plush): 90sigma (626430)
 Starlight Glimmer: zacatron94/BrunoMilan13 (1426211)
 Sunset Shimmer: shizow (2810521)
-Sweetie Belle: sirwarluscake (1184509)*
+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)*
+Unicorn Twilight Sparkle: redpandapony (2779548) ***
+Elements of Harmony: spiritofthwwolf (sic) (63922) *
+Cutie Mark Crusaders: parclytaxel (1761090) *
 
 Aloe and Lotus: jennieoo (773287)
 Trixie: chrzanek97 (2584896)
@@ -59,7 +59,7 @@ Villain Statue: prixy05 (2999547)
 
 Button Mash: luckreza8 (1004070)
 
-Thingpone: dvixie (2640948)** - Image flipped horizontally
+Thingpone: dvixie (2640948) ** - Image flipped horizontally
 
 Equestrian Flag: grabusz (1589868)
 Rainbow Laser: Vector-Brony (2493108 - attributed to someone else; original link in description)
@@ -74,13 +74,13 @@ Magic Mirror: nano23823 (2462765)
 Miss Pommel: chainchomp2 (964470)
 Derpy Hooves: starryshineviolet (2944310)
 Party Cannon: benpictures1 (2756837)
-Marble Pie: littlejurnalina (2824560)**
-Spitfire: fikrieka (2094942)***
+Marble Pie: littlejurnalina (2824560) **
+Spitfire: fikrieka (2094942) ***
 Miss Harshwhinny: brony-works (1416923)
 Herbal Cure Kit: the smiling pony (3064108)
-Fanfiction (closed): Unknown Artist (280765)*** - 1.5 only
-Fanfiction (open): Unknown Artist (280756)*** - 1.5 only
-Fanfiction (shelved): Me, making full use of my -20 art skill*** - 1.5 only
+Fanfiction (closed): Unknown Artist (280765)
+Fanfiction (open): Unknown Artist (280756)
+Fanfiction (shelved): Me, making full use of my -20 art skill
 
 MAIN MENU BACKGROUNDS (Requires Vanilla Backgrounds Expanded)
 
@@ -98,14 +98,15 @@ Obligatory OC Background: GeodesicDragon AKA me (not on Derpibooru)
 
 ACHIEVEMENTS
 
-Since most achievements are earned by making or building things, they'll use the same image as the texture for that building or item; these are the exceptions, as they are for making something using a specific material.
+Since most achievements are earned by making or building things, they'll use the same image as the texture for that building or item; these are the exceptions, as I wanted to use a more fitting image for them.
 
 Soylent Sparkle - orschmann (2558210)
 Why, Darling?! - slb94 (1870978)
 20% Grosser - tizerfiction (900692)
 What In Tarnation - tardifice (1662705)
 That Wasn't Very Kind Of You - wissle (2719109)
 Did Somebody Say 'Cupcakes?' - mrkat7214 (1986994)
+Special Delivery! - anarchemitis (390978) **
 
 Tombstone Icon: https://game-icons.net/1x1/sbed/tombstone.html **
 Talking Icon: https://game-icons.net/1x1/skoll/talk.html
@@ -125,7 +126,7 @@ OTHER IMAGES
 
 Star image (used in some achievements): http://clipart-library.com/clipart/216.htm
 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)**
+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

MyLittleRimPony/Anomaly/Defs/ThingDef_Buildings/Thingpone.xml

@@ -8,7 +8,7 @@
 	<designationHotKey>Misc8</designationHotKey>
     <graphicData>
       <texPath>Things/Building/Thingpone</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
+      <graphicClass>Graphic_Multi</graphicClass>
       <drawSize>(2,2)</drawSize>
     </graphicData>
 	<minifiedDef>MinifiedThing</minifiedDef>

MyLittleRimPony/Biotech/Defs/RecipeDefs/NightmareMoonOfferings_Sanguophage.xml

@@ -24,15 +24,7 @@
 					<li>Silver</li>
 				</thingDefs>
 			</filter>
-			<count>125</count>
-		</li>
-		<li>
-			<filter>
-				<thingDefs>
-					<li>HemogenPack</li>
-				</thingDefs>
-			</filter>
-			<count>5</count>
+			<count>200</count>
 		</li>
 	</ingredients>
 	<products>

MyLittleRimPony/Biotech/Defs/ResearchProjectDefs/MLRP_BiotechResearch.xml

@@ -5,7 +5,7 @@
 		<label>Sweetie Bot mechanoids</label>
 		<description>Unlocks the ability to gestate Sweetie Bot mechanoids at a large mech gestator.</description>
 		<prerequisites>
-			<li>HighMechtech</li>
+			<li>StandardMechtech</li>
 			<li>MLRP_WeaponisedElementsResearch</li>
 		</prerequisites>
 		<tab>MLRP_ResearchTab</tab>

MyLittleRimPony/Combat Extended/Defs/Ammo/CadenceJavelins.xml

@@ -29,6 +29,8 @@
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<ammoClass>Javelin</ammoClass>
+		<tradeability>Sellable</tradeability>
+		<destroyOnDrop>False</destroyOnDrop>
 	</ThingDef>
 
 

MyLittleRimPony/Combat Extended/Defs/Ammo/RainbowLasers.xml

@@ -27,23 +27,23 @@
 		<label>Harmony Lasers</label>
 		<ammoTypes>
 			<Ammo_HarmonyLaser>Projectile_HarmonyRainbow</Ammo_HarmonyLaser>
+			<Ammo_HarmonyLaser_Sabot>Projectile_HarmonyRainbow_Sabot</Ammo_HarmonyLaser_Sabot>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
 	<!-- ==================== Ammo ========================== -->
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
 		<defName>Ammo_HarmonyLaser</defName>
-		<label>Harmony lasers</label>
-		<description>Ammo for the Rainbow Laser and Sweetie Bot turret.\n\nVery bright and colourful.</description>
+		<label>Harmony lasers (AP)</label>
+		<description>Ammo for the Rainbow Laser and Sweetie Bot turret.\n\nVery bright and colourful, but also quite deadly.</description>
 		<statBases>
 			<Mass>0.025</Mass>
 			<Bulk>0.02</Bulk>
 			<MarketValue>0.3</MarketValue>
 		</statBases>
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
-			<!--<li>CE_AutoEnableCrafting_FabricationBench</li>-->
 		</tradeTags>
 		<thingCategories>
 			<li>MLRP_Ammo</li>
@@ -53,6 +53,8 @@
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<ammoClass>ArmorPiercing</ammoClass>
+		<tradeability>Sellable</tradeability>
+		<destroyOnDrop>False</destroyOnDrop>
 	</ThingDef>
 
 	<!-- Projectile is already defined elsewhere -->
@@ -61,9 +63,9 @@
 
 	<RecipeDef ParentName="ChargeAmmoRecipeBase">
 		<defName>MakeAmmo_HarmonyLaser</defName>
-		<label>make Harmony lasers x500</label>
-		<description>Craft 500 shots' worth of Harmony lasers.</description>
-		<jobString>Making harmony lasers.</jobString>
+		<label>make Harmony lasers (AP) x500</label>
+		<description>Craft 500 Harmony lasers (AP).</description>
+		<jobString>Making harmony lasers (AP).</jobString>
 		<workAmount>60</workAmount>
 		<recipeUsers>
 			<li>PlushieBench</li>

MyLittleRimPony/Combat Extended/Defs/Ammo/RainbowLasers_Sabot.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
+		<defName>Ammo_HarmonyLaser_Sabot</defName>
+		<label>Harmony lasers (Sabot)</label>
+		<description>Ammo for the Rainbow Laser and Sweetie Bot turret.\n\nVery bright and colourful, but also quite deadly.</description>
+		<statBases>
+			<Mass>0.025</Mass>
+			<Bulk>0.02</Bulk>
+			<MarketValue>0.3</MarketValue>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+		</tradeTags>
+		<thingCategories>
+			<li>MLRP_Ammo</li>
+		</thingCategories>
+		<graphicData>
+			<texPath>Things/AmmoBox/Ammo_HarmonyLaserSabot</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<ammoClass>Sabot</ammoClass>
+		<tradeability>Sellable</tradeability>
+		<destroyOnDrop>False</destroyOnDrop>
+	</ThingDef>
+
+	<ThingDef ParentName="BaseProjectileHarmony">
+		<defName>Projectile_HarmonyRainbow_Sabot</defName>
+		<label>Harmony laser (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>15</damageAmountBase>
+			<armorPenetrationSharp>64</armorPenetrationSharp>
+			<armorPenetrationBlunt>116</armorPenetrationBlunt>
+			<speed>180</speed>
+		</projectile>
+		<graphicData>
+			<texPath>Things/Projectiles/RainbowLaser</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+	</ThingDef>
+
+	<!-- Recipes -->
+
+	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+		<defName>MakeAmmo_HarmonyLaser_Sabot</defName>
+		<label>make Harmony lasers (Sabot) x500</label>
+		<description>Craft 500 Harmony lasers (sabot).</description>
+		<jobString>Making harmony lasers (Sabot).</jobString>
+		<workAmount>60</workAmount>
+		<recipeUsers>
+			<li>PlushieBench</li>
+			<li>AmmoBench</li>
+		</recipeUsers>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>40</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<products>
+			<Ammo_HarmonyLaser_Sabot>500</Ammo_HarmonyLaser_Sabot>
+		</products>
+		<researchPrerequisite>MLRP_CE_AmmoResearch</researchPrerequisite>
+	</RecipeDef>
+
+</Defs>

MyLittleRimPony/Combat Extended/Defs/Ammo/TennisBalls.xml

@@ -41,6 +41,8 @@
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<ammoClass>Smoke</ammoClass>
+		<tradeability>Sellable</tradeability>
+		<destroyOnDrop>False</destroyOnDrop>
 	</ThingDef>
 
 

MyLittleRimPony/Combat Extended/Defs/Ammo/WoodenBullets.xml

@@ -35,6 +35,8 @@
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<ammoClass>MLRP_WoodenBullet</ammoClass>
+		<tradeability>Sellable</tradeability>
+		<destroyOnDrop>False</destroyOnDrop>
 	</ThingDef>
 
 

MyLittleRimPony/Combat Extended/Patches/AggroTurret_Patches.xml

@@ -3,7 +3,7 @@
 <!--PATCH THE AMMO-->
 
 <Operation Class="PatchOperationAdd">
-	<xpath>/Defs/ThingDef[@Name="MLRP_WeaponisedArrogance"]</xpath>
+	<xpath>/Defs/ThingDef[defName="MLRP_WeaponisedArrogance"]</xpath>
 	<value>
 		<thingClass>CombatExtended.BulletCE</thingClass>
 	</value>
@@ -71,4 +71,28 @@
     </FireModes>
   </Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="MLRP_Weaponless"]/verbs</xpath>
+		<value>
+			<verbs>
+				<li Class="CombatExtended.VerbPropertiesCE">
+					<recoilAmount>1.5</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+					<hasStandardCommand>true</hasStandardCommand>
+					<requireLineOfSight>false</requireLineOfSight>
+					<defaultProjectile>MLRP_WeaponisedArrogance</defaultProjectile>
+					<warmupTime>0</warmupTime>
+					<range>10</range>
+					<burstShotCount>3</burstShotCount>
+					<ticksBetweenBurstShots>250</ticksBetweenBurstShots>
+					<targetParams>
+						<canTargetLocations>false</canTargetLocations>
+					</targetParams>
+					<consumeFuelPerShot>1</consumeFuelPerShot>
+				</li>
+			</verbs>
+		</value>
+	</Operation>
+
 </Patch>