Skip to content

Commit

Permalink
Merge pull request #3908 from skyarkhangel/development
Browse files Browse the repository at this point in the history
Development merged to master
  • Loading branch information
TheLoneTec authored Aug 1, 2024
2 parents a2d0457 + 70a1d17 commit 7706397
Show file tree
Hide file tree
Showing 199 changed files with 590 additions and 3,518 deletions.
248 changes: 155 additions & 93 deletions Config/Mod_Performance Fish_PerformanceFishMod.xml
Original file line number Diff line number Diff line change
@@ -1,120 +1,182 @@
<?xml version="1.0" encoding="utf-8"?>
<SettingsBlock>
<ModSettings Class="PerformanceFish.FishSettings">
<System.EqualityComparerOptimization.Optimization />
<Version>0.5.0.0</Version>
<AccessToolsCaching.AllTypes />
<StoreUtilityPatches.IsInValidBestStorage_Patch />
<JobSystem.JobGiver_HaulOptimization.PotentialWorkThingsGlobal_Patch />
<Hediffs.HediffComp_PsychicHarmonizer_Bugfix.CompPostTick_Patch />
<JobSystem.WorkGiver_MergeOptimization.JobOnThing_Patch />
<Hediffs.Pawn_PsychicEntropyTrackerOptimization.Psylink_Patch />
<JobSystem.WorkGiver_HaulOptimization.PotentialWorkThingsGlobal_Patch />
<RecipeDefCaching.AllRecipeUsers_Patch />
<ThingCompCaching.CompAssignableToPawn_Bed_Patch />
<GenLocalDateCaching.DayTickByMap_Patch />
<GenLocalDateCaching.DayTickByThing_Patch />
<MassUtilityCaching.GearMass_Patch />
<MassUtilityCaching.InventoryMass_Patch />
<MeditationUtilityCaching.PsyfocusGainPerTick />
<Listers.Misc.Building_Destroy_Patch />
<Hediffs.ImmunityHandlerCaching.ImmunityRecordExists />
<Hediffs.ImmunityHandlerCaching.NeededImmunitiesNow />
<Hediffs.ImmunityHandlerCaching.TryAddImmunityRecord />
<GenLocalDateCaching.DayTickByThing_Patch />
<GenLocalDateCaching.DayTickByMap_Patch />
<ThoughtWorker_Precept_AltarSharingOptimization.SharedAltar_Patch />
<Listers.Mergeables.Check_Patch />
<Listers.Mergeables.CheckAdd_Patch />
<Listers.Mergeables.TryRemove_Patch />
<UtilityPatches.ClearAllMapsAndWorld_Patch />
<UtilityPatches.FinalizeInit_Patch />
<Hediffs.HediffSetCaching.DirtyCache />
<RoomOptimizations.ContainedAndAdjacentThings_Patch />
<RoomOptimizations.RoomAt_Patch />
<RoomOptimizations.ContainedBeds_Patch />
<RoomOptimizations.Owners_Patch />
<RoomOptimizations.Regions_Patch />
<RoomOptimizations.Role_Patch />
<Listers.StorageSettingsPatches.AllowedToAccept_Patch />
<Listers.StorageSettingsPatches.TryNotifyChanged_Patch />
<Listers.Things.ThingsMatching_Patch />
<JobSystem.DisabledWorkTypesOptimization.PawnGetDisabledWorkTypes />
<Listers.Buildings.AllBuildingsNonColonistOfDef_Patch />
<Listers.Buildings.ColonistsHaveResearchBench_Patch />
<Listers.Buildings.ColonistsHaveBuildingWithPowerOn_Patch />
<Listers.Buildings.Map_Patch />
<Listers.Buildings.ColonistsHaveBuilding_Patch />
<Listers.Buildings.AllBuildingsColonistOfDef_Patch />
<ThingFilterPatches.SetAllow_Patch />
<ThingFilterPatches.SetAllowAll_Patch />
<ThingFilterPatches.AllowedThingDefs_Patch>
<enabled>False</enabled>
</ThingFilterPatches.AllowedThingDefs_Patch>
<ThingFilterPatches.CopyAllowancesFrom_Patch />
<ThingFilterPatches.SetDisallowAll_Patch />
<ThingFilterPatches.BestThingRequest_Patch />
<ThingFilterPatches.AllStorableThingDefs_Patch />
<Listers.Haulables.MapPreTick_Patch />
<Listers.Haulables.CheckAdd_Patch />
<Listers.Haulables.ListerHaulablesTick_Patch>
<enabled>False</enabled>
</Listers.Haulables.ListerHaulablesTick_Patch>
<Listers.Haulables.Check_Patch />
<Listers.Haulables.TryRemove_Patch />
<MiscOptimizations.DrawBatch_Flush />
<MiscOptimizations.RitualObligationTrigger_Date />
<MiscOptimizations.WindManager_WindManagerTick />
<MiscOptimizations.CompRottable />
<MiscOptimizations.ReportProbablyMissingAttributesFix />
<JobSystem.WorkGiver_DoBillOptimization.TryFindBestIngredientsHelper_Patch />
<JobSystem.WorkGiver_DoBillOptimization.TryFindBestIngredientsHelper_InnerDelegate_Patch />
<JobSystem.WorkGiver_DoBillOptimization.TryFindBestIngredientsInSet_NoMixHelper_Patch />
<RoomOptimizations.Owners_Patch>
<enabled>False</enabled>
</RoomOptimizations.Owners_Patch>
<RoomOptimizations.Regions_Patch />
<RoomOptimizations.Role_Patch />
<RoomOptimizations.ContainedAndAdjacentThings_Patch />
<RoomOptimizations.RoomAt_Patch />
<RoomOptimizations.ContainedBeds_Patch>
<enabled>False</enabled>
</RoomOptimizations.ContainedBeds_Patch>
<ThingCompCaching.CompAssignableToPawn_Bed_Patch />
<ThingFilterPatches.SetAllowAll_Patch />
<ThingFilterPatches.SetAllow_Patch />
<ThingFilterPatches.AllStorableThingDefs_Patch />
<ThingFilterPatches.BestThingRequest_Patch />
<ThingFilterPatches.CopyAllowancesFrom_Patch />
<ThingFilterPatches.SetDisallowAll_Patch />
<ThingFilterPatches.AllowedThingDefs_Patch />
<ThoughtWorker_Precept_AltarSharingOptimization.SharedAltar_Patch />
<UtilityPatches.ClearAllMapsAndWorld_Patch />
<UtilityPatches.FinalizeInit_Patch />
<System.EqualityComparerOptimization.Optimization />
<System.ReflectionCaching.TypePatches.GetProperty_Patch />
<System.ReflectionCaching.TypePatches.GetField_Patch />
<System.ReflectionCaching.ActivatorPatches.CreateInstance_Type />
<System.ReflectionCaching.TypePatches.GetMethodWithTypes_Patch />
<System.ReflectionCaching.TypePatches.GetConstructor_Patch />
<System.ReflectionCaching.FieldInfoPatches.SetValue_Patch />
<System.ReflectionCaching.TypePatches.GetFullName />
<System.ReflectionCaching.MonoCustomAttrs.GetCustomAttributes />
<System.ReflectionCaching.FieldInfoPatches.GetValue_Patch />
<System.ReflectionCaching.ActivatorPatches.CreateInstance_Type />
<System.ReflectionCaching.TypePatches.GetMethodWithFlags_Patch />
<System.ReflectionCaching.MonoCustomAttrs.GetCustomAttributes />
<System.ReflectionCaching.MethodBasePatches.Invoke_Patch />
<System.ReflectionCaching.TypePatches.GetMethodWithTypes_Patch />
<System.ReflectionCaching.FieldInfoPatches.SetValue_Patch />
<System.ReflectionCaching.TypePatches.GetMethodWithFlagsAndTypes_Patch />
<System.ReflectionCaching.TypePatches.GetField_Patch />
<System.ReflectionCaching.TypePatches.GetConstructor_Patch />
<System.ReflectionCaching.TypePatches.GetProperty_Patch />
<ModCompatibility.VanillaExpandedFixes.ExpandableGraphicData />
<LogPatches.ClassPatch />
<Planet.MothballOptimization.WorldPawnsDefPreventingMothball />
<Listers.Things.ThingsMatching_Patch />
<JobSystem.DisabledWorkTypesOptimization.PawnGetDisabledWorkTypes />
<JobSystem.JobGiver_HaulOptimization.PotentialWorkThingsGlobal_Patch />
<JobSystem.WorkGiver_DoBillOptimization.TryFindBestIngredientsInSet_NoMixHelper_Patch />
<JobSystem.WorkGiver_DoBillOptimization.TryFindBestIngredientsHelper_Patch />
<JobSystem.WorkGiver_HaulOptimization.PotentialWorkThingsGlobal_Patch />
<JobSystem.WorkGiver_MergeOptimization.JobOnThing_Patch />
<Hediffs.HediffComp_PsychicHarmonizer_Bugfix.CompPostTick_Patch />
<Hediffs.HediffSetCaching.DirtyCache />
<Hediffs.ImmunityHandlerCaching.NeededImmunitiesNow />
<Hediffs.ImmunityHandlerCaching.TryAddImmunityRecord />
<Hediffs.ImmunityHandlerCaching.ImmunityRecordExists />
<Hediffs.Pawn_PsychicEntropyTrackerOptimization.Psylink_Patch />
<Hauling.StorageSettingsPatches.AllowedToAcceptPatch />
<Hauling.StorageSettingsPatches.TryNotifyChanged_Patch />
<Defs.RecipeDefCaching.AllRecipeUsers_Patch />
<ContentFinderCaching.Get_Patch />
<ThingOwnerUtilityPreCaching.GetAllThingsRecursively_Patch />
<Planet.WorldPawnsOptimization.AllPawnsAlivePatch />
<Planet.WorldPawnsOptimization.AllPawnsAliveOrDeadPatch />
<DeepResourceGridOptimization.AnyActiveDeepScannersOnMapPatch />
<GasGridOptimization.MouseOverReadOutOnGUI />
<GasGridOptimization.Debug_ClearAllPatch />
<GasGridOptimization.SetDirectPatch />
<GasGridOptimization.Notify_ThingSpawnedPatch />
<GasGridOptimization.ColorAtPatch />
<GasGridOptimization.DensityAtPatch />
<GasGridOptimization.AnyGasAtPatch />
<GasGridOptimization.Debug_FillAllPatch />
<GasGridOptimization.DebugToolsGeneralPushGas />
<GasGridOptimization.TickPatch />
<GasGridOptimization.ExposeDataPatch />
<GasGridOptimization.AddGasPatch />
<GeneTrackerOptimization.GeneTrackerTickPatch />
<GenTypesPatches.AllSubclassesNonAbstract />
<GenTypesPatches.AllTypesWithAttribute />
<GenTypesPatches.AllTypes />
<GenTypesPatches.AllSubclasses />
<GetCompCaching.ThingCompPatch />
<GetCompCaching.ThingDefHasCompPatch />
<GetCompCaching.WorldObjectCompPatch />
<GetCompCaching.HediffCompPatch />
<GetCompCaching.GameComponentPatch />
<GetCompCaching.WorldComponentPatch />
<GetCompCaching.AbilityCompPatch />
<GetCompCaching.ThingCompPropertiesPatch />
<GetCompCaching.MapComponentPatch />
<GetCompCaching.HediffCompPropsPatch />
<IdeoBuildingPresenceDemandOptimization.BuildingPresentPatch />
<IdeoUtilityCaching.GetStyleDominance_Patch />
<UtilityPrepatches.ThingDestroy />
<UtilityPrepatches.CreateModClassesPatch />
<Planet.WorldPawnGCOptimization.WorldPawnGCTickPatch />
<Planet.WorldPawnGCOptimization.AddRelationshipsPatch />
<Planet.WorldPawnGCOptimization.GetCriticalPawnReasonPatch />
<Planet.WorldPawnGCOptimization.CancelGCPassPatch />
<MiscPrepatchedOptimizations.GenCollection_FirstOrDefault />
<LogPatches.ClassPatch />
<MapPrepatches.FinalizeLoadingPatch />
<MiscPrepatchedOptimizations.GenList_ListFullCopy />
<MiscPrepatchedOptimizations.GenGrid_InBoundsPatch />
<MiscPrepatchedOptimizations.GenCollection_FirstOrDefault />
<ModListerPatches.ModIncompatibilityIsSatisfiedPatch />
<ModListerPatches.AnyFromListActivePatch />
<ModsConfigPatches.AreAllActivePatch />
<ModsConfigPatches.IsAnyActiveOrEmptyPatch />
<StatCaching.GetStatValueAbstractPatch />
<StatCaching.SetStatBaseValuePatch />
<TextureLoadingPatches.ModContentLoader_LoadTexture />
<TextureLoadingPatches.ModContentLoader_LoadItem />
<TextureLoadingPatches.GetAllFilesForModPatch />
<TextureLoadingPatches.ModContentLoader_StaticConstructor />
<TextureLoadingPatches.ModContentLoader_LoadTexture />
<GenTypesPatches.AllSubclasses />
<GenTypesPatches.AllTypesWithAttribute />
<GenTypesPatches.AllSubclassesNonAbstract />
<GenTypesPatches.AllTypes />
<ThingOwnerUtilityPreCaching.GetAllThingsRecursively_Patch />
<ThingPatches.MapHeldPatch />
<ThingPatches.SpawnedPatch />
<ThingPatches.ExposeDataFixStuffPatch />
<UtilityPrepatches.CreateModClassesPatch />
<WorkGiverDefFixes.WorkerPatch />
<Planet.MothballOptimization.WorldPawnsDefPreventingMothball />
<Planet.WorldObjectsOptimization.WorldObjectsHolderTickPatch />
<Planet.WorldObjectsOptimization.ExpandingIconColorCaching />
<Planet.WorldObjectsOptimization.ExpandingIconCaching />
<Planet.WorldPawnGCOptimization.CancelGCPassPatch />
<Planet.WorldPawnGCOptimization.WorldPawnGCTickPatch />
<Planet.WorldPawnGCOptimization.AddRelationshipsPatch />
<Planet.WorldPawnGCOptimization.GetCriticalPawnReasonPatch />
<Planet.WorldPawnsOptimization.AllPawnsAliveOrDeadPatch />
<Planet.WorldPawnsOptimization.AllPawnsAlivePatch />
<Listers.Buildings.ColonistsHaveBuildingPatch />
<Listers.Buildings.AllBuildingsColonistOfDef_Patch />
<Listers.Buildings.AllBuildingsNonColonistOfDef_Patch />
<Listers.Buildings.ColonistsHaveBuildingWithPowerOnPatch />
<Listers.Buildings.AddPatch />
<Listers.Buildings.RemovePatch />
<Listers.Buildings.AllBuildingsColonistOfClassPatch />
<Listers.Buildings.ColonistsHaveResearchBenchPatch />
<Listers.Haulables.CheckPatch />
<Listers.Haulables.TryRemovePatch />
<Listers.Haulables.CheckAddPatch />
<Listers.Haulables.TickPatch />
<Listers.ThingOwnerOptimization.RemovePatch />
<Listers.ThingOwnerOptimization.ExposeDataPatch />
<Listers.ThingOwnerOptimization.TryAddPatch />
<Listers.ThingsPrepatches.RemovePatch />
<Listers.ThingsPrepatches.ClearPatch />
<Listers.ThingsPrepatches.AddPatch />
<Listers.ThingsPrepatches.ContainsPatch />
<JobSystem.WorkGiver_DoBillPrepatches.TryFindBestIngredientsHelper_InnerDelegate_Patch />
<Hediffs.HediffSetPrecaching.HasHediff />
<Hediffs.HediffSetPrecaching.GetFirstHediffOfDef />
<Hediffs.HediffSetPrecaching.GetNotMissingParts />
<GetCompCaching.HediffCompPropsPatch />
<GetCompCaching.WorldObjectCompPatch />
<GetCompCaching.GameComponentPatch />
<GetCompCaching.MapComponentPatch />
<GetCompCaching.HediffCompPatch />
<GetCompCaching.AbilityCompPatch />
<GetCompCaching.WorldComponentPatch />
<GetCompCaching.ThingCompPatch />
<GeneTrackerOptimization.GeneTrackerTickPatch />
<Planet.WorldObjectsOptimization.WorldObjectsHolderTickPatch />
<Hediffs.HediffSetPrecaching.GetFirstHediffOfDef />
<Hauling.GridsUtilityPatches.GetItemCountPatch />
<Hauling.HaulDestinationManagerPatches.CompareSlotGroupPrioritiesDescendingPatch />
<Hauling.HaulDestinationManagerPatches.RemoveHaulDestinationPatch />
<Hauling.HaulDestinationManagerPatches.AddHaulDestinationPatch />
<Hauling.HaulDestinationManagerPatches.Notify_HaulDestinationChangedPriorityPatch />
<Hauling.SlotGroupPrepatches.Notify_LostCellPatch />
<Hauling.SlotGroupPrepatches.Notify_AddedCellPatch />
<Hauling.StoreUtilityPrepatches.CurrentHaulDestinationOfPatch />
<Hauling.StoreUtilityPrepatches.TryFindBestBetterStoreCellForWorkerPatch />
<Hauling.StoreUtilityPrepatches.GetSlotGroupPatch />
<Hauling.StoreUtilityPrepatches.NoStorageBlockersInPatch />
<Hauling.StoreUtilityPrepatches.TryFindBestBetterStoreCellForPatch />
<Events.MapEvents.MapExposeComponentsPatch />
<Events.MapEvents.MapConstructComponentsPatch />
<Events.ThingEvents.SpawnSetupPatch />
<Events.ThingEvents.PostMakePatch />
<Events.ThingEvents.ExposeDataInitializePatch />
<Events.ThingEvents.DestroyPatch />
<Events.ThingEvents.SetQualityPatch />
<Events.ThingEvents.DeSpawnPatch />
<Events.ThingEvents.InitializeCompsPatch />
<Events.ThingGridEvents.RegisterInCellPatch />
<Events.ThingGridEvents.DeregisterInCellPatch />
<Defs.DefDatabasePatches.GetByShortHashPatch />
<Defs.DefDatabasePatches.GetNamedPatch />
<Defs.ThingDefPatches.BaseMassPatch />
<Defs.ThingDefPatches.BaseMaxHitPointsPatch />
<Defs.ThingDefPatches.GetHashCodePatch />
<Defs.ThingDefPatches.BaseFlammabilityPatch />
<Defs.ThingDefPatches.BaseMarketValuePatch />
</ModSettings>
</SettingsBlock>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Mods/Core_SK/Assemblies/Core_SK.dll
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -1579,11 +1579,16 @@
<defNames>
<li>CopperTile</li>
<li>TinTile</li>
<li>AluminiumTile</li>
<li>CupronickelTile</li>
<li>SteinTile</li>
<li>SilverTile</li>
<li>GoldTile</li>
<li>GoldSolid</li>
<!-- <li>FloorAmber</li>
<li>FloorJade</li>-->
<li>TitaniumTile</li>
<li>BetaPolyTile</li>
</defNames>
<designationCategory>OutsideFloors</designationCategory>
<debug>false</debug>
Expand Down
4 changes: 2 additions & 2 deletions Mods/Core_SK/Defs/Drugs/Drugs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<li>
<minSeverity>0.1</minSeverity>
<label>feeling better</label>
<painFactor>0.3</painFactor>
<painFactor>0.35</painFactor>
<capMods>
<li>
<capacity>Consciousness</capacity>
Expand Down Expand Up @@ -170,7 +170,7 @@
<li>
<minSeverity>0.01</minSeverity>
<label>Berserk herb high</label>
<painFactor>0.67</painFactor>
<painFactor>0.72</painFactor>
<statOffsets>
<Suppressability>-0.25</Suppressability>
</statOffsets>
Expand Down
13 changes: 8 additions & 5 deletions Mods/Core_SK/Defs/FactionDefs/Factions_Tribe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<points>
<li>(0, 4)</li>
<li>(1000, 3)</li>
<li>(1400, 2.5)</li>
<li>(2500, 1)</li>
<li>(5000, 0.6)</li>
<li>(7000, 0.35)</li>
Expand All @@ -73,8 +74,10 @@
<maxPawnCostPerTotalPointsCurve>
<points>
<li>(0,90)</li>
<li>(300, 130)</li>
<li>(600, 190)</li>
<li>(400, 110)</li> <!-- The player starts with an average of 350 points, ​​lower values are meaningless -->
<li>(600, 120)</li>
<li>(1000, 130)</li>
<li>(1400, 190)</li>
<li>(100000, 10000)</li>
</points>
</maxPawnCostPerTotalPointsCurve>
Expand Down Expand Up @@ -106,7 +109,7 @@
<Tribal_Hunter>10</Tribal_Hunter>
<Tribal_HeavyArcher>10</Tribal_HeavyArcher>
<Tribal_Berserker>5</Tribal_Berserker>
<Tribal_Demoman>4</Tribal_Demoman>
<Tribal_Demoman>2</Tribal_Demoman>
<Tribal_ChiefRanged>3</Tribal_ChiefRanged>
<Tribal_ChiefMelee>1.5</Tribal_ChiefMelee>
</options>
Expand All @@ -120,7 +123,7 @@
<Tribal_Hunter>10</Tribal_Hunter>
<Tribal_HeavyArcher>10</Tribal_HeavyArcher>
<Tribal_ChiefRanged>5</Tribal_ChiefRanged>
<Tribal_Demoman>3</Tribal_Demoman>
<Tribal_Demoman>1.5</Tribal_Demoman>
</options>
</li>
<li>
Expand All @@ -132,7 +135,7 @@
<Tribal_Warrior>10</Tribal_Warrior>
<Tribal_Berserker>10</Tribal_Berserker>
<Tribal_ChiefMelee>5</Tribal_ChiefMelee>
<Tribal_Demoman>2</Tribal_Demoman>
<Tribal_Demoman>1</Tribal_Demoman>
</options>
</li>
<li>
Expand Down
Loading

0 comments on commit 7706397

Please sign in to comment.