falloutcollab/FCP-Tools
0
0
Fork 0
mirror of https://github.com/FalloutCollaborationProject/FCP-Tools.git synced 2026-07-27 16:59:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

(STILL LARGELY UNTESTED) Updated references to target FCP.Core instead of old assembly

Browse Source
This commit is contained in:
nimrag-b
2025-01-25 16:18:56 +00:00
parent 363f86ef6a
commit 719be97a73
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
1.5/Assemblies/FCP_Core.dll
BIN
View File
Binary file not shown.
1.5/Defs/JobDefs/JobDefs.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<JobDef>
<defName>RR_RefuelPowerArmor</defName>
<driverClass>RangerRick_PowerArmor.JobDriver_RefuelPowerArmor</driverClass>
<driverClass>FCP.Core.JobDriver_RefuelPowerArmor</driverClass>
<reportString>Refueling TargetA.</reportString>
<allowOpportunisticPrefix>true</allowOpportunisticPrefix>
</JobDef>
@@ -18,7 +18,7 @@
<JobDef>
<defName>RR_TrainTrait</defName>
<driverClass>RangerRick_PowerArmor.JobDriver_TrainTrait</driverClass>
<driverClass>FCP.Core.JobDriver_TrainTrait</driverClass>
<reportString>Training at TargetA.</reportString>
<allowOpportunisticPrefix>true</allowOpportunisticPrefix>
</JobDef>
1.5/Defs/MiscDefs/ThingDefs_Laser_DamageHediffs.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<DamageDef Name="BurnLaser">
<defName>laserburn</defName>
<workerClass>FalloutCore.LaserBurn</workerClass>
<workerClass>FCP.Core.LaserBurn</workerClass>
<label>laser burn</label>
<hasForcefulImpact>false</hasForcefulImpact>
<makesBlood>false</makesBlood>
1.5/Defs/MiscDefs/ThingDefs_Plasma_DamageHediffs.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<DamageDef Name="BurnPlasma">
<defName>Plasmaburn</defName>
<workerClass>FalloutCore.PlasmaBurn</workerClass>
<workerClass>FCP.Core.PlasmaBurn</workerClass>
<label>plasma burn</label>
<hasForcefulImpact>false</hasForcefulImpact>
<makesBlood>false</makesBlood>
1.5/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
+3 -3
View File
@@ -56,8 +56,8 @@
<li>FCP_Power_Armor_Basic</li>
</tradeTags>
<comps>
<li Class="RangerRick_PowerArmor.CompProperties_ApparelDependency"></li>
<li Class="RangerRick_PowerArmor.CompProperties_PowerArmor">
<li Class="FCP.Core.CompProperties_ApparelDependency"></li>
<li Class="FCP.Core.CompProperties_PowerArmor">
<requiredTrait>FCP_Power_Armor_Trained</requiredTrait>
<hediffOnEmptyFuel>FCP_Power_Armor_Empty_Fusion_Core</hediffOnEmptyFuel>
</li>
@@ -78,7 +78,7 @@
</li>
</comps>
<modExtensions>
<li Class="FalloutCore.ApparelExtension">
<li Class="FCP.Core.ApparelExtension">
<shouldHideBody>True</shouldHideBody>
<displayBodyType>Hulk</displayBodyType>
</li>
1.5/Defs/ThingDefs_Buildings/Power_Armor_Simulator.xml
+1 -1
View File
@@ -53,7 +53,7 @@
</li>
<li Class="CompProperties_Flickable"/>
<li Class="CompProperties_Breakdownable"/>
<li Class="RangerRick_PowerArmor.CompProperties_Trainer">
<li Class="FCP.Core.CompProperties_Trainer">
<givesTrait>FCP_Power_Armor_Trained</givesTrait>
<trainDuration>5000</trainDuration>
</li>
Source/FCPTools/FalloutCore/Defs/ApparelExtensionDefModExtension.cs → Source/FCPTools/FalloutCore/Defs/ApparelExtension.cs
+1 -1
View File
@@ -10,7 +10,7 @@ using Verse;
#nullable disable
namespace FCP.Core
{
public class ApparelExtensionDefModExtension : DefModExtension
public class ApparelExtension : DefModExtension
{
public bool shouldHideBody;
public bool shouldHideHead;
Source/FCPTools/FalloutCore/Harmony/Patches.cs
+1 -1
View File
@@ -946,7 +946,7 @@ public static class Patches
return;
foreach (Thing thing in wearer.apparel.WornApparel)
{
ApparelExtensionDefModExtension modExtension = thing.def.GetModExtension<ApparelExtensionDefModExtension>();
ApparelExtension modExtension = thing.def.GetModExtension<ApparelExtension>();
if (modExtension != null && modExtension.displayBodyType != null)
{
bodyType = modExtension.displayBodyType;
Source/FCPTools/FalloutCore/Utilities/ApparelExtensionProps.cs
+5 -5
View File
@@ -14,23 +14,23 @@ namespace FCP.Core
[StaticConstructorOnStartup]
public static class ApparelExtensionProps
{
private static Dictionary<ThingDef, ApparelExtensionDefModExtension> cachedExtensions = new Dictionary<ThingDef, ApparelExtensionDefModExtension>();
private static Dictionary<ThingDef, ApparelExtension> cachedExtensions = new Dictionary<ThingDef, ApparelExtension>();
//static HarmonyInit() => new Harmony("FalloutCore.ApparelExtension").PatchAll();
public static bool ShouldHideBody(this ThingDef def)
{
ApparelExtensionDefModExtension modExtension;
ApparelExtension modExtension;
if (!cachedExtensions.TryGetValue(def, out modExtension))
cachedExtensions[def] = modExtension = def.GetModExtension<ApparelExtensionDefModExtension>();
cachedExtensions[def] = modExtension = def.GetModExtension<ApparelExtension>();
return modExtension != null && modExtension.shouldHideBody;
}
public static bool ShouldHideHead(this ThingDef def)
{
ApparelExtensionDefModExtension modExtension;
ApparelExtension modExtension;
if (!cachedExtensions.TryGetValue(def, out modExtension))
cachedExtensions[def] = modExtension = def.GetModExtension<ApparelExtensionDefModExtension>();
cachedExtensions[def] = modExtension = def.GetModExtension<ApparelExtension>();
return modExtension != null && modExtension.shouldHideHead;
}
}