API changes in 4.3

560 types in 138 namespaces

Markdown
namespace Mafi {
EventBase<TAction> class changed public abstract class EventBase<TAction> { + protected static bool TryBindCallback(Mafi.EventBase<TAction>.CallbackSaveData data, out TAction callback); }
IConsumer<T> interface added + public interface IConsumer<T> { + void Consume(in T item); + }
MafiMath class changed public static class MafiMath { + public static int FibonacciHash(int value, int range); + public static int FibonacciHashNext(ref int counter, int range); + [Mafi.PureAttribute] + public static double Floor(this double value); }
}
namespace Mafi.Collections {
LystStructExtensions class changed public static class LystStructExtensions { + public static ref Mafi.Collections.LystStruct<T> ClearAndReturn<T>(this ref Mafi.Collections.LystStruct<T> list); }
Lyst<T> class changed public sealed class Lyst<T> { + : Mafi.IConsumer<T> + void Mafi.IConsumer<T>.Consume(in T item); }
}
namespace Mafi.Core {
FileSystemHelper class changed public class FileSystemHelper { + public static void MoveFileWithOverwrite(string source, string dest, string backupPath); + public static void TryDeleteFile(string filePath); }
FileType enum changed public enum FileType { + Data = 13, }
}
namespace Mafi.Localization {
LocStr struct changed public readonly struct LocStr { - public readonly string Id; - public readonly string TranslatedString; + public string Id { get; } + public bool IsUnset { get; } + public string TranslatedString { get; } }
LocStr1 struct changed public readonly struct LocStr1 { - public readonly string Id; + public string Id { get; } }
LocStr1Plural struct changed public readonly struct LocStr1Plural { - public readonly string Id; + public string Id { get; } }
LocStr2 struct changed public readonly struct LocStr2 { - public readonly string Id; - public LocStr2(string id, string enString, string translatedString); + public string Id { get; } }
LocStr3 struct changed public readonly struct LocStr3 { - public readonly string Id; - public LocStr3(string id, string enString, string translatedString); + public string Id { get; } }
LocStr4 struct changed public readonly struct LocStr4 { - public readonly string Id; - public LocStr4(string id, string enString, string translatedString); + public string Id { get; } }
LocStrPrepared struct added + public readonly struct LocStrPrepared { + public Mafi.Localization.LocStrFormatted Format(); + public static Mafi.Localization.LocStrPrepared Of(Mafi.Localization.LocStr str); + public static Mafi.Localization.LocStrPrepared Of(Mafi.Localization.LocStr1 format, string arg0); + public static Mafi.Localization.LocStrPrepared Of(Mafi.Localization.LocStr2 format, string arg0, string arg1); + public static Mafi.Localization.LocStrPrepared Of(Mafi.Localization.LocStr3 format, string arg0, string arg1, string arg2); + public static Mafi.Localization.LocStrPrepared Of(Mafi.Localization.LocStr4 format, string arg0, string arg1, string arg2, string arg3); + public bool IsEmpty { get; } + }
LocalizationManager class changed public static class LocalizationManager { + public const string TRANSLATIONS_DIR = …; + public static bool CanPrefixStringIds(string modId); + public static void ClearLoadedTranslations(); public static void ExportJsonTranslationsFile( System.IO.TextWriter srcWriter, Mafi.Option<System.IO.TextWriter> trWriter, + Mafi.Option<string> modId = default, ); + public static Mafi.Collections.Lyst<string> GetLegacyStringIdsOf(string modId); + public static Mafi.Collections.Lyst<string> GetMalformedStringIdsOf(string modId); + public static bool IsLanguageLoaded(Mafi.Localization.LocalizationManager.LangInfo lang); + public static void MarkEndOfCoreStrings(); + public static void MarkEntriesRegisteredBy(int fromIndex, string modId); + public static void MergeModTranslations(bool reportIgnoredKeys = true); + public static void RegisterModTranslations(string modId, string translationsDirPath); + public static bool TryGetLangInfo(string cultureInfoId, out Mafi.Localization.LocalizationManager.LangInfo lang); + public static bool TryGetLangInfoForCulture(string cultureName, out Mafi.Localization.LocalizationManager.LangInfo lang); public static bool TryLoadTranslationsFrom( string langData, string changelogData, Mafi.Localization.LocalizationManager.LangInfo lang, + string baseLangData = "", ); + public static void WarnAboutLegacyStringsOf(string modId); + public static int RegisteredEntriesCount { get; } + public static System.Globalization.CultureInfo SystemUiCultureInfo { get; } public readonly struct LangInfo { + public readonly Mafi.Option<string> BaseCultureInfoId; public LangInfo( string cultureInfoId, string languageTitle, string languageTitleEnglish, string fileName, Mafi.Percent percentTranslated, int pluralFormsCount, System.Func<Mafi.Fix64, int> pluralIndexFunction, bool usesSymbols = false, + Mafi.Option<string> baseCultureInfoId = default, ); } }
}
namespace Mafi.Numerics {
Vector2Float struct changed public readonly struct Vector2Float { + : System.IEquatable<Mafi.Numerics.Vector2Float> + public bool Equals(Mafi.Numerics.Vector2Float other); }
}
namespace Mafi.Serialization {
JsonObjectBuilder class added + public sealed class JsonObjectBuilder { + public JsonObjectBuilder(); + public JsonObjectBuilder(System.Predicate<System.Type> isExcludedType); + public bool CanBuild(System.Reflection.ConstructorInfo ctor, out string blockedBy); + public bool CanBuild(System.Type type, out string blockedBy); + public bool CanBuildFromPlainValue(System.Type type); + public string DescribeConstructors(System.Type type); + public string DescribeJson(System.Type type); + public static string DescribeValue(object json); + public static bool IsOptional(System.Reflection.ParameterInfo parameter); + public void RegisterConverter(System.Type type, string jsonDescription, Mafi.Serialization.JsonValueReader reader, Mafi.Serialization.JsonValueWriter writer); + public object ToJson(object value); + public bool TryBuild(System.Type type, object json, out object result, out string error); + }
JsonValueReader delegate added + public delegate bool JsonValueReader(System.Type type, object json, out object result, out string error);
JsonValueWriter delegate added + public delegate object JsonValueWriter(object value);
JsonWriter class changed - public class JsonWriter { + public sealed class JsonWriter { + public JsonWriter(); + public JsonWriter(Mafi.Serialization.JsonObjectBuilder builder, int capacity = 64); - public JsonWriter(int capacity); + public JsonWriter(int capacity = 64); - public void AppendBoolField(string name, bool value); - public void AppendEndObject(); - public void AppendNumberField(string name, double value); - public void AppendNumberField(string name, int value); - public void AppendNumberField(string name, long value); - public void AppendStartObject(); - public void AppendStringField(string name, string value); + public Mafi.Serialization.JsonWriter BeginArray(); + public Mafi.Serialization.JsonWriter BeginObject(); + public Mafi.Serialization.JsonWriter EndArray(); + public Mafi.Serialization.JsonWriter EndObject(); + public Mafi.Serialization.JsonWriter Field(string name, bool value); + public Mafi.Serialization.JsonWriter Field(string name, double value); + public Mafi.Serialization.JsonWriter Field(string name, long value); + public Mafi.Serialization.JsonWriter Field(string name, string value); + public string GetJson(); + public Mafi.Serialization.JsonWriter Name(string name); + public Mafi.Serialization.JsonWriter Value(bool value); + public Mafi.Serialization.JsonWriter Value(double value); + public Mafi.Serialization.JsonWriter Value(long value); + public Mafi.Serialization.JsonWriter Value(string value); + public Mafi.Serialization.JsonWriter ValueOf(object value); }
ReflectionUtils class changed public static class ReflectionUtils { + public static object GetDefaultValue(System.Reflection.ParameterInfo parameter); - public static void SetProperty<T>(T obj, string fieldName, object value) where T : class; + public static void SetProperty<T>(T obj, string name, object value) where T : class; }
}
namespace Mafi.Base {
Assets class changed public static class Assets { public static class Base { public static class Buildings { public static class Farms { - public const string FarmSprinklers_Sound_prefab = …; + public static class Sprinklers { + public const string WaterSprinklers_ogg = …; + } } public static class Maintenance { public static class T0 { - public const string MaintenanceDepotT0Sound_prefab = …; + public const string MaintenanceDepotT0_ogg = …; } public static class T1 { - public const string MaintenanceDepotT1Sound_prefab = …; + public const string MaintenanceDepotT1_ogg = …; } } public static class NuclearReactors { public static class Shared { - public const string ReactorSound_prefab = …; + public const string Reactor_ogg = …; } } public static class RocketLaunchPad { public static class Audio { + public const string LiftOff_ogg = …; - public const string LiftOff_prefab = …; + public const string _1_ogg = …; - public const string _1_prefab = …; + public const string _2_ogg = …; - public const string _2_prefab = …; + public const string _3_ogg = …; - public const string _3_prefab = …; + public const string _4_ogg = …; - public const string _4_prefab = …; + public const string _5_ogg = …; - public const string _5_prefab = …; } } public static class VehicleDepots { public static class T1 { - public const string DepotT1Sound_prefab = …; + public const string DepotT1_ogg = …; } } } public static class Machines { public static class Assembly { public static class AssemblyT1 { - public const string AssemblyT1Sound_prefab = …; + public const string AssemblyT1_ogg = …; } public static class AssemblyT2 { - public const string AssemblyT2Sound_prefab = …; + public const string AssemblyT2_ogg = …; } public static class AssemblyT4 { - public const string AssemblerSound_prefab = …; + public const string Assembler_ogg = …; } } public static class Electronics { public static class SiliconReactor { - public const string SiliconReactorSound_prefab = …; + public const string SiliconReactor_ogg = …; } } public static class Food { public static class Mill { - public const string MillSound_prefab = …; + public const string Mill_ogg = …; } } public static class General { public static class FermentationTank { - public const string FermentationTankSound_prefab = …; + public const string FermentationTank_ogg = …; } } public static class Glass { public static class GlassMaker { - public const string GlassMakerSound_prefab = …; + public const string GlassMaker_ogg = …; } } public static class Gold { public static class SettlingTank { - public const string SettlingTankSound_prefab = …; + public const string SettlingTank_ogg = …; } } public static class Infrastructure { public static class ConcreteMixer { - public const string ConcreteMixer_Sound_prefab = …; + public const string ConcreteMixer_ogg = …; } } public static class MetalWorks { public static class BlastFurnaceT1 { - public const string BlastFurnace_Sound_prefab = …; + public const string BlastFurnace_ogg = …; } public static class CharcoalMaker { - public const string CharcoalMakerSound_prefab = …; + public const string CharcoalMaker_ogg = …; } public static class CrusherT1 { - public const string Crusher_Sound_prefab = …; + public const string Crusher_ogg = …; } public static class FiltrationStation { - public const string FiltrationStationSound_prefab = …; + public const string FiltrationStation_ogg = …; } } public static class Oil { public static class AnaerobicDigester { - public const string AnaerobicDigesterSound_prefab = …; + public const string AnaerobicDigester_ogg = …; } public static class BasicDistiller { - public const string BasicDistillerSound_prefab = …; + public const string BasicDistiller_ogg = …; } public static class DistillationT1 { - public const string DistillationT1Sound_prefab = …; + public const string DistillationT1_ogg = …; } public static class Flares { - public const string FlareSound_prefab = …; + public const string Flare_ogg = …; } public static class HydroCracker { - public const string HydroCrackerSound_prefab = …; + public const string HydroCracker_ogg = …; } public static class HydrogenSynthesizer { - public const string HydrogenSynthesizerSound_prefab = …; + public const string HydrogenSynthesizer_ogg = …; } public static class PolymerizationPlant { - public const string PolymerizationPlantSound_prefab = …; + public const string PolymerizationPlant_ogg = …; } - public static class Reformer { - public const string ReformerSound_prefab = …; - } public static class SourWaterStripper { - public const string SourWaterStripperSound_prefab = …; + public const string SourWaterStripper_ogg = …; } public static class VacuumDistillation { - public const string VacuumDistillationSound_prefab = …; + public const string VacuumDistillation_ogg = …; } } public static class PowerPlant { public static class CombustionEngine { - public const string CombustionEngine_Sound_prefab = …; + public const string DieselGenerator_ogg = …; } public static class Flywheel { - public const string FlywheelSound_prefab = …; + public const string Flywheel_ogg = …; } public static class Generator { - public const string GeneratorSound_prefab = …; + public const string Generator_ogg = …; } public static class GeneratorT2 { - public const string GeneratorT2Sound_prefab = …; + public const string GeneratorT2_ogg = …; } - public static class SmokeStack { - public const string SmokeStackSound_prefab = …; - } public static class TurbineHP { - public const string TurbineHP_Sound_prefab = …; + public const string TurbineHP_ogg = …; } public static class TurbineLP { - public const string TurbineLPSound_prefab = …; + public const string TurbineLP_ogg = …; } } public static class Pump { public static class LandWaterPump { - public const string LandWaterPump_Sound_prefab = …; + public const string LandWaterPump_ogg = …; } public static class OilPump { - public const string OilPump_Sound_prefab = …; + public const string OilPump_ogg = …; } } public static class Water { public static class BoilerCoal { + public const string Boiler_ogg = …; - public const string CoalBoiler_Sound_prefab = …; } public static class BoilerElectric { - public const string BoilerElectricSound_prefab = …; + public const string BoilerElectric_ogg = …; } - public static class BoilerGas { - public const string BoilerGasSound_prefab = …; - } public static class WasteDump { - public const string WasteDump_Sound_prefab = …; + public const string WasteDump_ogg = …; } } } public static class Products { public static class Icons { + public const string BrokenGlassPressed_svg = …; - public const string MetalScrap128_png = …; + public const string MixedMinedMaterial_svg = …; + public const string Recyclables_svg = …; } } public static class Ships { public static class BattleShip { public static class Audio { + public const string Arrival_ogg = …; - public const string Arrival_prefab = …; + public const string Departure_ogg = …; - public const string Departure_prefab = …; + public const string Engine_ogg = …; - public const string Engine_prefab = …; } } public static class CargoShip { public static class Audio { + public const string Arrival_ogg = …; - public const string Arrival_prefab = …; + public const string Departure_ogg = …; - public const string Departure_prefab = …; + public const string Engine_ogg = …; - public const string Engine_prefab = …; } } } public static class Trains { + public const string RailBlock_prefab = …; + public const string TrainTrackSpeedInstanced_mat = …; + public const string TrainTrackSpeedReflectedInstanced_mat = …; + public const string WagonT2Nuclear_prefab = …; public static class LevelCrossings { - public const string LevelCrossing_Sound_prefab = …; + public const string coi_rail_bells_3_ogg = …; } public static class Stations { + public const string StationNuclearWaste_prefab = …; + public static class StationNuclearWaste { + public const string StationNuclearWaste_signIn_mat = …; + public const string StationNuclearWaste_signOut_mat = …; + } } } public static class Transports { public static class Audio { + public const string MoltenPlaced_ogg = …; - public const string MoltenPlaced_prefab = …; + public const string PipePlaced_ogg = …; - public const string PipePlaced_prefab = …; + public const string TransportPlaced_ogg = …; - public const string TransportPlaced_prefab = …; } } public static class Vehicles { public static class ExcavatorT1 { public static class Audio { + public const string Dig1_ogg = …; - public const string Dig1_prefab = …; + public const string Dig2_ogg = …; - public const string Dig2_prefab = …; + public const string Dump1_ogg = …; - public const string Dump1_prefab = …; + public const string Dump2_ogg = …; - public const string Dump2_prefab = …; + public const string Dump3_ogg = …; - public const string Dump3_prefab = …; + public const string Engine_ogg = …; - public const string Engine_prefab = …; + public const string Treads_ogg = …; - public const string Treads_prefab = …; } } public static class ExcavatorT2 { public static class Audio { + public const string Engine_ogg = …; - public const string Engine_prefab = …; + public const string Treads_ogg = …; - public const string Treads_prefab = …; } } public static class ExcavatorT3 { public static class Audio { + public const string Engine_ogg = …; - public const string Engine_prefab = …; + public const string Treads_ogg = …; - public const string Treads_prefab = …; } } public static class ModularTruck { public static class Audio { + public const string Engine_ogg = …; - public const string Engine_prefab = …; } } public static class ModularTruckSmall { public static class Audio { + public const string Engine_ogg = …; - public const string Engine_prefab = …; } } public static class ModularTruckT3 { public static class Audio { + public const string Engine_ogg = …; - public const string Engine_prefab = …; } } public static class RocketTransporter { public static class Audio { + public const string EngineAndTreads_ogg = …; - public const string EngineAndTreads_prefab = …; } } public static class Rockets { + public const string RocketSound_ogg = …; - public const string RocketSound_prefab = …; } public static class TreeHarvester { + public const string CuttingSound_ogg = …; - public const string CuttingSound_prefab = …; + public const string TrimmingSound_ogg = …; - public const string TrimmingSound_prefab = …; } } } public static class Core { public static class IconOverlay { + public const string IconBadgeInstanced_mat = …; } } }
}
namespace Mafi.Base.Prototypes {
PopNeedDiseaseTrigger class changed + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_unlockedProtosDb", 342, typeof(Mafi.Core.Prototypes.UnlockedProtosDb))] public class PopNeedDiseaseTrigger { public PopNeedDiseaseTrigger( Mafi.Base.Prototypes.PopNeedDiseaseProto popNeedDiseaseProto, Mafi.Core.Buildings.Settlements.SettlementsManager settlementsManager, - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Simulation.ICalendar calendar, ); }
}
namespace Mafi.Base.Prototypes.Buildings {
BillboardProto class changed public class BillboardProto { + public readonly float EmissionStrength; + public readonly bool SoftenColors; + new public class Gfx : Mafi.Core.Entities.Static.Layout.LayoutEntityProto.Gfx { + public const float DEFAULT_EMISSION_STRENGTH = 10; + public readonly float EmissionStrength; + public readonly bool SoftenColors; + public Gfx(string prefabPath, bool softenColors, Mafi.Option<string> customIconPath = default, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Static.Layout.ToolbarEntryData>? categories = null, bool removeUndergroundVertices = false, bool doNotFlipModel = false, float emissionStrength = 10); + } }
CheatingProductsSourceSink class changed public class CheatingProductsSourceSink { + : Mafi.Core.Entities.IEntityWithProducts + void Mafi.Core.Entities.IEntityWithProducts.ForEachHeldProduct<TConsumer>(TConsumer consumer); }
RestrictedBillboardProto class added + public class RestrictedBillboardProto : Mafi.Base.Prototypes.Buildings.BillboardProto, Mafi.Core.Prototypes.IProto, Mafi.Core.Prototypes.IProtoWithRestrictedUnlock { + public RestrictedBillboardProto(Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Base.Prototypes.Buildings.BillboardProto.Gfx graphics, Mafi.ColorRgba defaultPrimaryColor, Mafi.ColorRgba defaultSecondaryColor); + }
RestrictedWaterFloatingDecorationProto class added + public class RestrictedWaterFloatingDecorationProto : Mafi.Base.Prototypes.Buildings.WaterFloatingDecorationProto, Mafi.Core.Prototypes.IProto, Mafi.Core.Prototypes.IProtoWithRestrictedUnlock { + public RestrictedWaterFloatingDecorationProto(Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Base.Prototypes.Buildings.WaterFloatingDecorationProto.WaterFloatingGfx graphics); + }
Statue class changed public class Statue { - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> InputBuffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> InputBuffer { get; } }
TombOfCaptains class changed public class TombOfCaptains { - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> FlowersBuffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> FlowersBuffer { get; } - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> FuelBuffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> FuelBuffer { get; } }
UniversalProductsSink class changed public class UniversalProductsSink { + : Mafi.Core.Entities.IEntityWithProducts + void Mafi.Core.Entities.IEntityWithProducts.ForEachHeldProduct<TConsumer>(TConsumer consumer); }
}
namespace Mafi.Base.Prototypes.Buildings.ThermalStorages {
ThermalStorage class changed public sealed class ThermalStorage { + : Mafi.Core.Factory.IEntityWithUiRecipesInUse + bool Mafi.Core.Factory.IEntityWithUiRecipesInUse.IsUiRecipeInUse(Mafi.Core.Factory.Recipes.IRecipeForUi recipe); }
}
namespace Mafi.Base.Prototypes.Machines {
CompactorData class changed public class CompactorData { - public const int COMPRESS_MULT = 3; }
}
namespace Mafi.Base.Prototypes.Machines.ComputingEntities {
Mainframe class changed public class Mainframe { + public Mafi.Computing CurrentComputingGeneration { get; } }
}
namespace Mafi.Base.Prototypes.Machines.PowerGenerators {
ElectricityGeneratorFromMechPower class changed public class ElectricityGeneratorFromMechPower { - public Mafi.Core.Entities.SoundParams? SoundParams { get; } }
ElectricityGeneratorFromMechPowerProto class changed public class ElectricityGeneratorFromMechPowerProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> SoundPrefabPath; } }
ElectricityGeneratorFromProduct class changed public class ElectricityGeneratorFromProduct { - public Mafi.Core.Entities.SoundParams? SoundParams { get; } }
ElectricityGeneratorFromProductProto class changed public class ElectricityGeneratorFromProductProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> SoundPrefabPath; } }
FlyWheelEntity class changed public class FlyWheelEntity { - public Mafi.Core.Entities.SoundParams? SoundParams { get; } }
FlyWheelEntityProto class changed public class FlyWheelEntityProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> SoundPrefabPath; } }
MechPowerGeneratorFromProduct class changed public sealed class MechPowerGeneratorFromProduct { - public Mafi.Core.Entities.SoundParams? SoundParams { get; } }
MechPowerGeneratorFromProductProto class changed public class MechPowerGeneratorFromProductProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> SoundPrefabPath; } }
}
namespace Mafi.Base.Prototypes.Products {
MinedMaterialsCategoryData class added + public class MinedMaterialsCategoryData : Mafi.Core.Mods.IModData { + public MinedMaterialsCategoryData(); + public void RegisterData(Mafi.Core.Mods.ProtoRegistrator registrator); + }
RecyclablesCategoryData class added + public class RecyclablesCategoryData : Mafi.Core.Mods.IModData { + public RecyclablesCategoryData(); + public void RegisterData(Mafi.Core.Mods.ProtoRegistrator registrator); + }
}
namespace Mafi.Base.Prototypes.Research {
ResearchCosts class changed public static class ResearchCosts { + public static readonly int ShieldedTrains; }
}
namespace Mafi.Base.Prototypes.Sandbox {
ProductsSinkEntity class changed public class ProductsSinkEntity { + : Mafi.Core.Entities.IEntityWithProducts + void Mafi.Core.Entities.IEntityWithProducts.ForEachHeldProduct<TConsumer>(TConsumer consumer); }
}
namespace Mafi.Base.Prototypes.Trains {
LocomotivesData class changed public class LocomotivesData { - public static Mafi.Core.Entities.SoundSpec CreateBrakingSound(Mafi.Core.Entities.SoundFalloff falloff, string soundPath = "Assets/Base/Trains/Audio/Shared-BrakingSqueal01.ogg", float baseVolume = 0.6); - public static Mafi.Core.Entities.SoundSpec CreateEngineIdleSound(Mafi.Core.Entities.SoundFalloff falloff, string soundPath, float baseVolume = 0.5); - public static Mafi.Core.Entities.SoundSpec CreateEngineMovingSound(Mafi.Core.Entities.SoundFalloff falloff, string soundPath, float baseVolume = 1, Mafi.Core.Entities.SoundEffectParam volumeParam = default, Mafi.Core.Entities.SoundEffectParam pitchParam = default); - public static Mafi.Core.Entities.SoundSpec CreateHornSound(Mafi.Core.Entities.SoundFalloff falloff, string soundPath, float baseVolume = 1); - public static Mafi.Core.Trains.LocoSoundSpecs CreateLocoSounds(Mafi.Core.Entities.SoundFalloff falloff, string engineIdle, string enginePower, string horn, string motion = "Assets/Base/Trains/Audio/Shared-WheelRollingNoise01.ogg", string braking = "Assets/Base/Trains/Audio/Shared-BrakingSqueal01.ogg", string stopped = "Assets/Base/Trains/Audio/Shared-AirBrakePuff01.ogg", string configsFolder = null); - public static Mafi.Core.Entities.SoundSpec CreateMotionSound(Mafi.Core.Entities.SoundFalloff falloff, string soundPath = "Assets/Base/Trains/Audio/Shared-WheelRollingNoise01.ogg", float baseVolume = 0.5, Mafi.Core.Entities.SoundEffectParam volumeParam = default, Mafi.Core.Entities.SoundEffectParam pitchParam = default); - public static Mafi.Core.Entities.SoundSpec CreateStoppedSound(Mafi.Core.Entities.SoundFalloff falloff, string soundPath = "Assets/Base/Trains/Audio/Shared-AirBrakePuff01.ogg", float baseVolume = 0.8); - public static Mafi.Core.Trains.TrainCarSoundSpecs CreateWagonSounds(Mafi.Core.Entities.SoundFalloff falloff, string motion = "Assets/Base/Trains/Audio/Shared-WheelRollingNoise01.ogg", string braking = "Assets/Base/Trains/Audio/Shared-BrakingSqueal01.ogg", string stopped = "Assets/Base/Trains/Audio/Shared-AirBrakePuff01.ogg"); }
TrackReplacingEntityBase<TProto> class added + public abstract class TrackReplacingEntityBase<TProto> : Mafi.Core.Trains.LayoutEntityWithTrainTrackBase where TProto : Mafi.Core.Trains.TrackReplacingEntityBaseProto { + protected TrackReplacingEntityBase(Mafi.Core.EntityId id, TProto proto, Mafi.Core.TileTransform transform, Mafi.Core.Entities.EntityContext context, Mafi.Core.Trains.TrainTracksGraphManager graphManager); + public Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Trains.TrainTrackPillarInfoRel> GetTransformedPillarsData(Mafi.Core.Transform90RotFlip transform); + [Mafi.Serialization.DoNotSaveAttribute] + new public TProto Prototype { get; protected set; } + [Mafi.Serialization.DoNotSaveAttribute] + protected abstract TProto TypedPrototype { get; set; } + }
TrainStationFuel class changed public sealed class TrainStationFuel { + : Mafi.Core.Entities.IEntityWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; }
TrainStationModule class changed public class TrainStationModule { + : Mafi.Core.Environment.IShieldedEntity + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + void Mafi.Core.Environment.IShieldedEntity.ForEachShieldedProduct<TConsumer>(TConsumer consumer); - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> Buffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IMixedProductBuffer> Buffer { get; } + public bool IsRadiationShielded { get; } + [Mafi.Serialization.DoNotSaveAttribute] + public Mafi.Core.Products.ProductSlimId LastReceivedProductId { get; } + bool Mafi.Core.Environment.IShieldedEntity.HasShielding { get; } }
TrainStationModuleProto class changed public class TrainStationModuleProto { + public readonly bool FinishPassBeforeDisconnect; + public readonly int TransferTickWhenLoading; + public readonly int TransferTickWhenUnloading; public TrainStationModuleProto( Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Core.Trains.TrainTrackTrajectoryData trajectoryData, Mafi.Core.Products.ProductType productType, Mafi.Quantity capacity, Mafi.Duration transferPeriod, Mafi.Quantity transferQuantity, Mafi.Percent connectionCompletionPerStep, Mafi.Electricity powerConsumption, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Animations.AnimationParams> animationParams, Mafi.Base.Prototypes.Trains.TrainStationModuleProto.Gfx graphics, Mafi.RelTile1f? maxSpeedTilesPerTick = null, Mafi.Duration? constructionDurationPerProduct = null, Mafi.Upoints? boostCost = null, bool cannotBeReflected = false, System.Predicate<Mafi.Core.Products.ProductProto> isProductSupportedOverride = null, bool isElectrified = false, Mafi.Percent? connectionCompletionPerStepWhenUnloading = null, + bool isRadiationShielded = false, + bool transferAtWagonEndOfAnimation = false, ); }
TrainStationWaypoint class changed public class TrainStationWaypoint { + : Mafi.Base.Prototypes.Trains.TrackReplacingEntityBase<Mafi.Base.Prototypes.Trains.TrainStationWaypointProto> - Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Trains.TrainTrackPillarInfoRel> Mafi.Core.Trains.ITrainTrackMayBeElevatedFriend.GetTransformedPillarsData(Mafi.Core.Transform90RotFlip transform); - [Mafi.Serialization.DoNotSaveAttribute] - new public Mafi.Base.Prototypes.Trains.TrainStationWaypointProto Prototype { get; protected set; } }
TrainStationsData class changed public class TrainStationsData { + public static Mafi.Base.Prototypes.Trains.TrainStationModuleProto RegisterShieldedStation(Mafi.Core.Mods.ProtoRegistrator registrator, Mafi.Core.Entities.Static.StaticEntityProto.ID id, bool electrified = false); + public static void RegisterTrackBuffers(Mafi.Core.Mods.ProtoRegistrator registrator, bool electrified = false); }
TrainTrackBuffer class added + public class TrainTrackBuffer : Mafi.Base.Prototypes.Trains.TrackReplacingEntityBase<Mafi.Base.Prototypes.Trains.TrainTrackBufferProto>, Mafi.Core.Entities.IAreaSelectableEntity, Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IEntityWithCloneableConfig, Mafi.Core.Entities.IEntityWithPosition, Mafi.Core.Entities.IEntityWithReplaceVerification, Mafi.Core.Entities.IObjectWithTitle, Mafi.Core.Entities.IRenderedEntity, Mafi.Core.Entities.IUpgradableEntity, Mafi.Core.Entities.IUpgradableEntityWithCustomUi, Mafi.Core.Entities.Static.ILayoutEntity, Mafi.Core.Entities.Static.IStaticEntity, Mafi.Core.Trains.IDiagonalTrainTrack, Mafi.Core.Trains.IEntityWithTrainTrack, Mafi.Core.Trains.IEntityWithTrainTrackFriend, Mafi.Core.Trains.ITrainTrackBuffer, Mafi.Core.Trains.ITrainTrackBufferFriend, Mafi.Core.Trains.ITrainTrackManagedEntity, Mafi.Core.Trains.ITrainTrackMayBeElevatedFriend, Mafi.Core.Trains.ITrainTracksGraphPiece, Mafi.Serialization.IIsSafeAsHashKey { + public TrainTrackBuffer(Mafi.Core.EntityId id, Mafi.Base.Prototypes.Trains.TrainTrackBufferProto proto, Mafi.Core.TileTransform transform, Mafi.Core.Entities.EntityContext context, Mafi.Core.Trains.TrainTracksGraphManager graphManager); + public void AddPillar(Mafi.Core.Trains.TrainTrackPillar pillar); + public void AddPillarOnlyInfo(Mafi.Core.Trains.TrainTrackPillarInfoRel pillarInfoRel); + public static Mafi.Base.Prototypes.Trains.TrainTrackBuffer Deserialize(Mafi.Serialization.BlobReader reader); + void Mafi.Core.Entities.IEntityWithCloneableConfig.AddToConfig(Mafi.Core.Entities.EntityConfigData data); + void Mafi.Core.Entities.IEntityWithCloneableConfig.ApplyConfig(Mafi.Core.Entities.EntityConfigData data); + void Mafi.Core.Trains.ITrainTrackBufferFriend.RemoveAndCarryOverProducts(); + public void RemovePillar(Mafi.Core.Trains.TrainTrackPillar pillar); + public static void Serialize(Mafi.Base.Prototypes.Trains.TrainTrackBuffer value, Mafi.Serialization.BlobWriter writer); + public void SetAllowsTurnaround(bool allowsTurnaround); + public bool AllowsTurnaround { get; } + Mafi.Core.Trains.ITrainTrackMayBeElevatedProto Mafi.Core.Trains.ITrainTrackMayBeElevatedFriend.TrackProto { get; } + public uint PillarBlocksBitmap { get; } + public Mafi.Collections.ReadonlyCollections.ReadOnlyArraySlice<Mafi.Core.Trains.TrainTrackPillar> Pillars { get; } + }
TrainTrackBufferProto class added + public class TrainTrackBufferProto : Mafi.Core.Trains.TrainTrackBufferBaseProto { + public TrainTrackBufferProto(Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Entities.Static.Layout.EntityLayout customInterTrackLayout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Core.Trains.TrainTrackTrajectoryData trajectoryData, bool isElevated, bool isBumperAtTrajectoryEnd, Mafi.Core.Trains.EntityWithTrainTrackBaseProto.Gfx graphics, Mafi.RelTile1f? maxSpeedTilesPerTick = null, Mafi.Duration? constructionDurationPerProduct = null, bool isElectrified = false); + }
TrainTracksData class changed public class TrainTracksData { + public static readonly Mafi.RelTile1f G25_MAX_SPEED; }
TrainWagonsData class changed public class TrainWagonsData { + public static readonly Mafi.Quantity T2_SHIELDED_WAGON_CAPACITY; }
}
+ namespace Mafi.Base.Sounds {
SoundBindingsData class added + public class SoundBindingsData : Mafi.Core.Mods.IModData { + public SoundBindingsData(); + public void RegisterData(Mafi.Core.Mods.ProtoRegistrator registrator); + }
SoundsData class added + public class SoundsData : Mafi.Core.Mods.IModData { + public SoundsData(); + public void RegisterData(Mafi.Core.Mods.ProtoRegistrator registrator); + }
+ }
namespace Mafi {
IRealTimeProvider interface changed public interface IRealTimeProvider { + System.DateTime UtcNow { get; } }
MockRealTimeProvider class changed public class MockRealTimeProvider { + public System.DateTime UtcNow { get; set; } }
QuantityExtensions class changed public static class QuantityExtensions { + public static void AddQuantity(this Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> list, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); }
RealTimeProvider class changed public class RealTimeProvider { + public System.DateTime UtcNow { get; } }
}
namespace Mafi.Core {
IdsCore class changed public static class IdsCore { public static class Products { + public const string MIXED_MINED_MATERIAL = …; + public static readonly Mafi.Core.Products.ProductProto.ID MixedMinedMaterial; + public const string RECYCLABLES_PRESSED = …; + public static readonly Mafi.Core.Products.ProductProto.ID RecyclablesPressed; } }
}
namespace Mafi.Core.Buildings.Cargo {
CargoDepotCheatFullFuelCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class CargoDepotCheatFullFuelCmd { }
}
namespace Mafi.Core.Buildings.Cargo.Ships {
CargoShipProto class changed public class CargoShipProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string ArrivalSoundPath; + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string DepartureSoundPath; } }
CargoShipV2 class changed public class CargoShipV2 { + : Mafi.Core.Environment.IExplicitlyPollutingEntity }
}
namespace Mafi.Core.Buildings.Farms {
AnimalFarm class changed public class AnimalFarm { - public Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Static.IProductBuffer> OutputBuffers; + public Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Static.IPlainProductBuffer> OutputBuffers; - public Mafi.Core.Entities.Static.IProductBuffer CarcassBuffer { get; } + public Mafi.Core.Entities.Static.IPlainProductBuffer CarcassBuffer { get; } - public Mafi.Core.Entities.Static.IProductBuffer FoodInputBuffer { get; } + public Mafi.Core.Entities.Static.IPlainProductBuffer FoodInputBuffer { get; } - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> ProductProducedBuffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> ProductProducedBuffer { get; } - public Mafi.Core.Entities.Static.IProductBuffer WaterInputBuffer { get; } + public Mafi.Core.Entities.Static.IPlainProductBuffer WaterInputBuffer { get; } }
Farm class changed public class Farm { + : Mafi.Core.Factory.IEntityWithInputsOutsideUiRecipes + bool Mafi.Core.Factory.IEntityWithInputsOutsideUiRecipes.IsInputInUseOutsideUiRecipes(Mafi.Core.Products.ProductProto product); + bool Mafi.Core.Factory.IEntityWithUiRecipesInUse.IsUiRecipeInUse(Mafi.Core.Factory.Recipes.IRecipeForUi recipe); - public System.Collections.Generic.IReadOnlyCollection<Mafi.Core.Entities.Static.IProductBuffer> OutputBuffers { get; } + public System.Collections.Generic.IReadOnlyCollection<Mafi.Core.Entities.Static.IPlainProductBuffer> OutputBuffers { get; } - public Mafi.Core.Entities.SoundParams? SoundParams { get; } }
FarmProto class changed public class FarmProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> SprinklerSoundPath; public Gfx( string prefabPath, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.RelTile2f> cropPositions, Mafi.Option<string> sprinklerPrefabPath, - Mafi.Option<string> sprinklerSoundPath, + Mafi.Option<string> sprinklerSoundPath = default, Mafi.RelTile3f prefabOrigin = default, Mafi.Option<string> customIconPath = default, Mafi.ColorRgba color = default, bool hideBlockedPortsIcon = false, Mafi.Core.Entities.Static.Layout.LayoutEntityProto.VisualizedLayers? visualizedLayers = null, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Static.Layout.ToolbarEntryData>? categories = null, bool useInstancedRendering = false, bool useSemiInstancedRendering = false, bool disableEmptyChildrenStripping = false, ); } }
}
namespace Mafi.Core.Buildings.Offices {
OfficeBuilding class changed public class OfficeBuilding { - public Mafi.Core.Entities.Static.IProductBuffer InputBuffer { get; } + public Mafi.Core.Entities.Static.IPlainProductBuffer InputBuffer { get; } - public Mafi.Core.Entities.Static.IProductBuffer OutputBuffer { get; } + public Mafi.Core.Entities.Static.IMixedProductBuffer OutputBuffer { get; } }
OfficeBuildingProto class changed public class OfficeBuildingProto { + public readonly Mafi.Core.Products.ProductProto OutputProduct; - public readonly Mafi.Core.ProductQuantity ProducedPerRecipe; public OfficeBuildingProto( Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Electricity electricityConsumed, Mafi.Core.ProductQuantity consumedPerRecipe, - Mafi.Core.ProductQuantity producedPerRecipe, + Mafi.Core.Products.ProductProto outputProduct, Mafi.Quantity inputBufferCapacity, Mafi.Quantity outputBufferCapacity, Mafi.Duration durationForRecipe, int maxComputingBoostSteps, System.Func<int, Mafi.Computing> computingCostPerBoostStep, System.Func<int, Mafi.Percent> bonusPointsPerComputingStep, Mafi.Core.Entities.Static.Layout.LayoutEntityProto.Gfx graphics, ); }
}
namespace Mafi.Core.Buildings.OreSorting {
OreSortingPlant class changed public class OreSortingPlant { public class OreSortingPlantProductData { + public void AddInProcess(Mafi.Core.Products.ProductProto member, Mafi.Quantity quantity); + public void ClearInProcess(Mafi.Core.Products.IProductsManager productsManager); + public void DestroyInProcess(Mafi.Core.Products.IProductsManager productsManager, Mafi.Quantity quantity, Mafi.Option<Mafi.Core.Prototypes.Proto> destroyer); + public void GetInProcessBreakdown(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public Mafi.Quantity PushSortedToBuffer(Mafi.Quantity quantity); + public Mafi.Option<Mafi.Core.Entities.Static.IMixedProductBuffer> InProcessBuffer { get; } + public bool IsMixedMinedEntry { get; } - public Mafi.Quantity UnsortedQuantity { get; set; } + public Mafi.Quantity UnsortedQuantity { get; } } }
OreSortingPlantProto class changed public class OreSortingPlantProto { + public Mafi.Core.Products.MixedMaterialCategory AcceptedMixedCategory { get; } }
}
namespace Mafi.Core.Buildings.RainwaterHarvesters {
RainHarvestingHelper class changed public class RainHarvestingHelper { public RainHarvestingHelper( Mafi.Core.Environment.IWeatherManager weatherManager, Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.Entities.IEntity entity, - Mafi.Core.Entities.Static.IProductBuffer waterBuffer, + Mafi.Core.Entities.Static.IPlainProductBuffer waterBuffer, Mafi.PartialQuantity waterCollectedPerDay, Mafi.Core.PropertiesDb.IPropertiesDb propertiesDb, ); }
}
namespace Mafi.Core.Buildings.ResearchLab {
ResearchLab class changed public class ResearchLab { - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> InputBuffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> InputBuffer { get; } - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> OutputBuffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IMixedProductBuffer> OutputBuffer { get; } }
ResearchLabProto class changed public class ResearchLabProto { + public Mafi.Option<Mafi.Core.Products.ProductProto> OutputProduct; - public Mafi.Core.ProductQuantity ProducedPerRecipe; public ResearchLabProto( Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Electricity electricityConsumed, Mafi.Computing computingConsumed, Mafi.Upoints unityMonthlyCost, Mafi.Core.Population.UpointsCategoryProto upointsCategory, Mafi.Duration durationForRecipe, Mafi.Fix32 sciencePerRecipe, Mafi.Core.ProductQuantity consumedPerRecipe, - Mafi.Core.ProductQuantity producedPerRecipe, + Mafi.Option<Mafi.Core.Products.ProductProto> outputProduct, Mafi.Quantity inputBufferCapacity, Mafi.Quantity outputBufferCapacity, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Animations.AnimationParams> animationParams, int tierIndex, Mafi.Core.Entities.Static.Layout.LayoutEntityProto.Gfx graphics, int? emissionIntensity = null, ); }
}
namespace Mafi.Core.Buildings.Settlements {
Hospital class changed public class Hospital { + : Mafi.Core.Factory.IEntityWithUiRecipesInUse - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer(int bufferSlot); + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer(int bufferSlot); + bool Mafi.Core.Factory.IEntityWithUiRecipesInUse.IsUiRecipeInUse(Mafi.Core.Factory.Recipes.IRecipeForUi recipe); }
Settlement class changed public class Settlement { + public Mafi.Percent GetHousingShareOf(Mafi.Core.Buildings.Settlements.SettlementHousingModule house, Mafi.Option<Mafi.Core.Buildings.Settlements.PopNeed> need); + public void GetSlotModules(Mafi.Collections.Lyst<System.Collections.Generic.KeyValuePair<Mafi.Core.Entities.IEntity, Mafi.Option<Mafi.Core.Buildings.Settlements.PopNeed>>> outModules); public void TransformProductIntoWaste( - Mafi.Option<Mafi.Core.Prototypes.Proto> source, + Mafi.Core.Entities.IEntity source, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, ); }
SettlementFoodModule class changed public class SettlementFoodModule { + : Mafi.Core.Factory.IEntityWithUiRecipesInUse - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer(int bufferSlot); + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer(int bufferSlot); + bool Mafi.Core.Factory.IEntityWithUiRecipesInUse.IsUiRecipeInUse(Mafi.Core.Factory.Recipes.IRecipeForUi recipe); }
SettlementHousingModule class changed public class SettlementHousingModule { + : Mafi.Core.Population.IEntityProvidingHousing }
SettlementWasteModule class changed public class SettlementWasteModule { + public Mafi.Quantity StoreAsMuchAs(Mafi.Core.ProductQuantity pq); }
}
namespace Mafi.Core.Buildings.Shipyard {
Shipyard class changed public class Shipyard { + : Mafi.Core.Entities.IEntityWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + public void GetBreakdownByPlaceholder(Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity>> result); + public Mafi.Quantity GetStoredQuantityOf(Mafi.Core.Products.ProductProto product); + public void StoreBuffer(Mafi.Core.Entities.Static.ProductBuffer source, Mafi.Quantity quantity); }
ShipyardCheatFullFuelCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class ShipyardCheatFullFuelCmd { }
}
namespace Mafi.Core.Buildings.SpaceProgram {
RocketLaunchPadProto class changed public class RocketLaunchPadProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public Mafi.Collections.ImmutableCollections.ImmutableArray<string> CountdownSoundPrefabs; } }
}
namespace Mafi.Core.Buildings.Storages {
LogisticsBuffer class changed public class LogisticsBuffer { + public static int ClampStepOfCmd(int step); }
Storage class changed public class Storage { + [Mafi.Serialization.DoNotSaveAttribute] + public Mafi.Core.Products.ProductSlimId LastReceivedProductId { get; } }
StorageBase class changed public abstract class StorageBase { + : Mafi.Core.Entities.IEntityWithProducts + public virtual void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; - protected virtual void OnReceivedFromPort(Mafi.Quantity quantityReceived); - protected Mafi.Option<Mafi.Core.Buildings.Storages.LogisticsBuffer> Buffer { get; } + protected internal Mafi.Option<Mafi.Core.Buildings.Storages.LogisticsBuffer> Buffer { get; } }
StorageCheatClearProductCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class StorageCheatClearProductCmd { }
StorageCheatProductCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class StorageCheatProductCmd { }
StorageSetCheatModeCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class StorageSetCheatModeCmd { }
}
namespace Mafi.Core.Buildings.Storages.NuclearWaste {
NuclearWasteStorage class changed public class NuclearWasteStorage { + : Mafi.Core.Environment.IShieldedEntity + : Mafi.Core.Factory.IEntityWithUiRecipesInUse public NuclearWasteStorage( Mafi.Core.EntityId id, Mafi.Core.Buildings.Storages.NuclearWasteStorageProto storageProto, Mafi.Core.TileTransform transform, Mafi.Core.Entities.EntityContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Vehicles.IVehiclesManager vehiclesManager, Mafi.Core.Vehicles.IVehicleBuffersRegistry vehicleBuffersRegistry, - Mafi.Core.Environment.IRadiationManager radiationManager, Mafi.Core.SandboxManager sandboxManager, ); + void Mafi.Core.Environment.IShieldedEntity.ForEachShieldedProduct<TConsumer>(TConsumer consumer); + bool Mafi.Core.Factory.IEntityWithUiRecipesInUse.IsUiRecipeInUse(Mafi.Core.Factory.Recipes.IRecipeForUi recipe); + bool Mafi.Core.Environment.IShieldedEntity.HasShielding { get; } }
}
namespace Mafi.Core.Buildings.VehicleDepots {
VehicleDepotBase class changed public abstract class VehicleDepotBase { - public Mafi.Core.Entities.SoundParams? SoundParams { get; } }
VehicleDepotBaseProto class changed public abstract class VehicleDepotBaseProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> SoundPrefabPath; } }
VehicleDepotProtoBuilder class changed public sealed class VehicleDepotProtoBuilder { public class State { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public Mafi.Core.Buildings.VehicleDepots.VehicleDepotProtoBuilder.State SetSoundPath(string soundPath); } }
}
namespace Mafi.Core.Buildings.Waste {
WasteSortingPlant class changed public class WasteSortingPlant { + public void GetInputBufferBreakdown(Mafi.Core.Products.MixedMaterialCategory category, Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); - public System.Collections.Generic.IReadOnlyCollection<Mafi.Core.Entities.Static.IProductBuffer> InputBuffers { get; } + public System.Collections.Generic.IReadOnlyCollection<Mafi.Core.Entities.Static.IMixedProductBuffer> InputBuffers { get; } - public Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.Entities.Static.IProductBuffer> OutputBuffers { get; } + public Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.Entities.Static.IPlainProductBuffer> OutputBuffers { get; } }
}
namespace Mafi.Core.Economy {
AssetTransactionManager class changed public class AssetTransactionManager { + public Mafi.Quantity StoreBuffer(Mafi.Core.Entities.Static.ProductBuffer sourceBuffer, Mafi.Quantity quantity); + public void StoreBufferToOverflow(Mafi.Core.Entities.Static.ProductBuffer sourceBuffer, Mafi.Quantity quantity); }
AssetTransactionManagerExtensions class changed public static class AssetTransactionManagerExtensions { + public static void StoreClearedPile(this Mafi.Core.Economy.IAssetTransactionManager atm, Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Factory.Transports.MixedPile pile); }
IAssetTransactionManager interface changed public interface IAssetTransactionManager { + Mafi.Quantity StoreBuffer(Mafi.Core.Entities.Static.ProductBuffer source, Mafi.Quantity quantity); + void StoreBufferToOverflow(Mafi.Core.Entities.Static.ProductBuffer source, Mafi.Quantity quantity); }
IOverflowProductsStorage interface changed public interface IOverflowProductsStorage { + void StoreBuffer(Mafi.Core.Entities.Static.ProductBuffer source, Mafi.Quantity quantity); }
}
namespace Mafi.Core.Entities {
EntitiesCommandsProcessor class changed public class EntitiesCommandsProcessor { public EntitiesCommandsProcessor( Mafi.Core.Entities.EntitiesManager entitiesManager, Mafi.DependencyResolver resolver, Mafi.Core.Prototypes.ProtosDb protosDb, - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Entities.EntitiesCreator entitiesCreator, Mafi.Core.Entities.Static.UpgradesManager upgradesManager, Mafi.Core.Entities.Static.ConstructionManager constructionManager, Mafi.Core.Entities.EntitiesCloneConfigHelper configCloneHelper, Mafi.Core.Factory.Transports.TransportsManager transportsManager, Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Core.Factory.Transports.TransportsCommandsProcessor transportsCommandsProcessor, Mafi.Core.Factory.Transports.TransportsConstructionHelper transportsConstructionHelper, Mafi.Core.Terrain.TerrainOccupancyManager occupancyManager, Mafi.Core.Economy.AssetTransactionManager assetTransactionManager, Mafi.Core.Terrain.Designation.SurfaceDesignationsManager surfaceDesignationsManager, Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Core.Trains.TrainTrackBuilder trainTrackBuilder, Mafi.Core.Trains.TrainTracksPillarManager trainTracksPillarManager, Mafi.Option<Mafi.Core.Trains.ITrainTracksPolesManager> trainTracksPolesManager, Mafi.Core.Terrain.Trees.ITreePlantingManager treePlantingManager, Mafi.Core.Entities.Static.Layout.LayoutEntityAddRequestFactory addRequestFactory, Mafi.Core.Population.IUpointsManager upointsManager, Mafi.Core.Entities.DefaultLogisticsModeManager logisticsModeManager, ); }
EntitiesManager class changed public sealed class EntitiesManager { + public int GetEntitiesCount(Mafi.Core.Prototypes.IProto proto); + public void NotifyEntityProtoChanged(Mafi.Core.Entities.IEntity entity, Mafi.Core.Entities.IEntityProto oldProto); }
EntityContext class changed public sealed class EntityContext { + public readonly Mafi.Core.Environment.EntityPollutionTracker PollutionTracker; + public readonly Mafi.Core.Products.EntityProductFlowTracker ProductFlowTracker; + public readonly Mafi.Core.Environment.IRadiationManager RadiationManager; public EntityContext( Mafi.Core.Entities.Static.IConstructionManager constructionManager, Mafi.Core.Entities.Static.IUpgradesManager upgradesManager, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.Entities.Static.IVirtualBuffersMap virtualBuffersMap, Mafi.Core.Economy.IAssetTransactionManager assetTransactionManager, Mafi.Core.Notifications.INotificationsManager notificationsManager, Mafi.Core.PropertiesDb.IPropertiesDb propertiesDb, Mafi.Core.Ports.Io.IIoPortsManager ioPortsManager, Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Stats.IFuelStatsCollector fuelStatsCollector, Mafi.Core.Population.IWorkersManager workersManager, Mafi.Core.Population.IUpointsManager upointsManager, Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.Factory.ComputingPower.IComputingConsumerFactory computingConsumerFactory, Mafi.Core.Factory.ElectricPower.IElectricityConsumerFactory electricityConsumerFactory, Mafi.Core.Population.IUnityConsumerFactory unityConsumerFactory, Mafi.Core.Maintenance.IEntityMaintenanceProvidersFactory entityMaintenanceProvidersFactory, Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.IoPortId.Factory portIdFactory, Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Core.Terrain.Props.TerrainPropsManager terrainPropsManager, Mafi.Core.Terrain.ITerrainOccupancyManager occupancyManager, Mafi.Core.Environment.AirPollutionManager airPollutionManager, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Core.Vehicles.ILogisticsZonesManager logisticsZonesManager, Mafi.Core.Terrain.Designation.IUnreachablesManager unreachablesManager, Mafi.Core.Entities.Static.Layout.LayoutEntityAddRequestFactory layoutEntityAddRequestFactory, Mafi.Core.Roads.IRoadsManager roadsManager, Mafi.Core.SandboxManager sandboxManager, + Mafi.Core.Environment.EntityPollutionTracker pollutionTracker, + Mafi.Core.Products.EntityProductFlowTracker productFlowTracker, + Mafi.Core.Environment.IRadiationManager radiationManager, ); }
IEntityWithHeldProducts interface added + [Mafi.Serialization.OnlyForSaveCompatibilityAttribute] + [System.ObsoleteAttribute] + public interface IEntityWithHeldProducts { + }
IEntityWithLinkedParts interface added + public interface IEntityWithLinkedParts : Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IObjectWithTitle, Mafi.Core.Entities.IRenderedEntity, Mafi.Serialization.IIsSafeAsHashKey { + void GetLinkedParts(Mafi.Collections.Lyst<Mafi.Core.Entities.IRenderedEntity> outParts); + }
IEntityWithProducts interface added + public interface IEntityWithProducts : Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IObjectWithTitle, Mafi.Serialization.IIsSafeAsHashKey { + void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + }
IEntityWithSound interface changed public interface IEntityWithSound { - Mafi.Core.Entities.SoundParams? SoundParams { get; } }
IEntityWithSoundLine interface added + public interface IEntityWithSoundLine : Mafi.Core.Entities.IEntityWithSound { + void GetSoundLine(Mafi.Collections.Lyst<Mafi.Tile3f> path); + }
SoundEffectParam struct removed - public readonly struct SoundEffectParam { - public readonly float BaseValue; - public readonly float Multiplier; - public SoundEffectParam(float baseValue, float multiplier); - public float Apply(float value); - public bool IsActive { get; } - }
SoundFalloff enum removed - public enum SoundFalloff { - SmallVehicle = 10, - LargeVehicle = 15, - SmallTrain = 25, - LargeTrain = 40, - }
SoundParams struct removed - public readonly struct SoundParams { - public SoundParams(string prefabPath, Mafi.Core.Entities.SoundSignificance significance, bool loop = true, bool fadeOnChange = true, bool doNotLimit = false); - public bool DoNotLimit { get; } - public bool FadeOnChange { get; } - public bool Loop { get; } - public Mafi.Core.Entities.SoundSignificance Significance { get; } - public string SoundPrefabPath { get; } - }
SoundSignificance enum removed - public enum SoundSignificance { - VerySmall = 0, - Small = 1, - Normal = 2, - Medium = 3, - High = 4, - }
SoundSpec class removed - public class SoundSpec { - public static readonly Mafi.Core.Entities.SoundSpec NoSound; - public readonly string SoundPath; - public SoundSpec(string soundPath, Mafi.Core.Entities.SoundFalloff soundFalloff, float baseVolume = 1, float basePitch = 1, bool loop = false, float fadeOnChangeSec = 0, bool fadeOnChange = false, bool doNotLimit = false, bool startAtRandomTime = false, Mafi.Core.Entities.SoundEffectParam paramVolume = default, Mafi.Core.Entities.SoundEffectParam paramPitch = default); - public void NotifyParamUsage(string name); - public void SetConfigJsoncPath(string path); - public bool TryMarkConfigApplied(); - public void UpdateFromJson(Mafi.Collections.Dict<string, object> json); - public bool AnyParamActive { get; } - public float BasePitch { get; } - public float BaseVolume { get; } - public string ConfigJsoncPath { get; } - public bool DoNotLimit { get; } - public float FadeOnChangeSec { get; } - public bool Loop { get; } - public Mafi.Option<string> ParamName { get; } - public Mafi.Core.Entities.SoundEffectParam ParamPitch { get; } - public Mafi.Core.Entities.SoundEffectParam ParamVolume { get; } - public Mafi.Core.Entities.SoundFalloff SoundFalloff { get; } - public bool StartAtRandomTime { get; } - }
}
namespace Mafi.Core.Entities.Dynamic {
DynamicGroundEntityProto class changed public abstract class DynamicGroundEntityProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string EngineSoundPath; + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string MovementSoundPath; public Gfx( string prefabPath, Mafi.Option<string> customIconPath, Mafi.RelTile2f frontContactPtsOffset, Mafi.RelTile2f rearContactPtsOffset, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Dynamic.DynamicEntityDustParticlesSpec> dustParticles, Mafi.Option<Mafi.Core.Entities.Dynamic.VehicleExhaustParticlesSpec> exhaustParticlesSpec, - string engineSoundPath, + string engineSoundPath = null, - string movementSoundPath, + string movementSoundPath = null, ); } }
FuelTank class changed public class FuelTank { - public void ConsumeFuelPerUpdate(Mafi.Core.Vehicles.VehicleFuelConsumption consumption); + public Mafi.PartialQuantity ConsumeFuelPerUpdate(Mafi.Core.Vehicles.VehicleFuelConsumption consumption); - public void ConsumeFuelPerUpdate(Mafi.Percent consumptionPercent); + public Mafi.PartialQuantity ConsumeFuelPerUpdate(Mafi.Percent consumptionPercent); }
TruckProtoBuilder class changed public class TruckProtoBuilder { public class TruckProtoBuilderState { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public Mafi.Core.Entities.Dynamic.TruckProtoBuilder.TruckProtoBuilderState SetEngineSound(string engineSoundPath); } }
Vehicle class changed public abstract class Vehicle { + : Mafi.Core.Environment.IExplicitlyPollutingEntity }
}
namespace Mafi.Core.Entities.Static {
ConstructionManager class changed public class ConstructionManager { + : Mafi.Core.Input.ICommandProcessor<Mafi.Core.Entities.Static.Commands.FinishBuildOfStaticEntityCheatCmd> + void Mafi.IAction<Mafi.Core.Entities.Static.Commands.FinishBuildOfStaticEntityCheatCmd>.Invoke(Mafi.Core.Entities.Static.Commands.FinishBuildOfStaticEntityCheatCmd cmd); public void StartDeconstruction( Mafi.Core.Entities.Static.IStaticEntity staticEntity, bool doNotCreateProducts = false, Mafi.Core.Entities.EntityRemoveReason entityRemoveReason = Remove, bool createEmptyBuffersWithCapacity = false, + bool keepPendingRefund = false, ); }
FloatingEntityAdditionValidator class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class FloatingEntityAdditionValidator : Mafi.Core.Entities.Validators.IEntityAdditionValidator, Mafi.Core.Entities.Validators.IEntityAdditionValidator<Mafi.Core.Entities.Static.Layout.LayoutEntityAddRequest> { + public static readonly Mafi.HeightTilesI FLOATING_HEIGHT; + public FloatingEntityAdditionValidator(Mafi.Core.Entities.Static.StaticEntityOceanReservationManagerV2 oceanAreaManager); + public Mafi.Core.Entities.Validators.EntityValidationResult CanAdd(Mafi.Core.Entities.Static.Layout.LayoutEntityAddRequest addRequest); + public Mafi.Core.Entities.Validators.EntityValidatorPriority Priority { get; } + }
FreeConstructionManager class changed public class FreeConstructionManager { public void StartDeconstruction( Mafi.Core.Entities.Static.IStaticEntity staticEntity, bool doNotCreateProducts = false, Mafi.Core.Entities.EntityRemoveReason entityRemoveReason = Remove, bool createEmptyBuffersWithCapacity = false, + bool keepPendingRefund = false, ); }
IConstructionManager interface changed public interface IConstructionManager { void StartDeconstruction( Mafi.Core.Entities.Static.IStaticEntity staticEntity, bool doNotCreateProducts = false, Mafi.Core.Entities.EntityRemoveReason entityRemoveReason = Remove, bool createEmptyBuffersWithCapacity = false, + bool keepPendingRefund = false, ); }
IEntityWithMultipleProductsToAssign interface changed public interface IEntityWithMultipleProductsToAssign { - Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer(int bufferSlot); + Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer(int bufferSlot); }
IMixedProductBuffer interface added + public interface IMixedProductBuffer : Mafi.Core.Entities.Static.IProductBuffer, Mafi.Core.Entities.Static.IProductBufferReadOnly { + void AdvanceMixedMemberRotation(); + void GetMixedBreakdown(Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity> result); + void GetMixedBreakdown(ref Mafi.Collections.LystStruct<Mafi.Core.ProductQuantity> result); + void GetMixedBreakdown(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + int GetMixedBreakdown(ref System.Collections.Generic.KeyValuePair<Mafi.Core.Products.ProductSlimId, Mafi.Quantity>[] result, int startIndex = 0); + Mafi.Quantity GetMixedBreakdownTotal(); + Mafi.Quantity GetQuantityOfMixedMember(Mafi.Core.Products.ProductProto member); + Mafi.Quantity RemoveAndDestroyAsMuchAs(Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Products.ProductProto product, Mafi.Quantity maxQuantity, Mafi.Core.Products.DestroyReason reason, Mafi.Option<Mafi.Core.Prototypes.Proto> destroyer = default); + Mafi.Quantity RemoveAsMuchAs(Mafi.Core.Products.ProductProto product, Mafi.Quantity maxQuantity, bool doNotReport = false); + Mafi.Quantity RemoveAsMuchAs(Mafi.Quantity maxQuantity, Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> removedMembers); + Mafi.Quantity RemoveAsMuchAs_DropMembersProportionally(Mafi.Quantity maxQuantity); + void StoreAllIgnoreCapacity(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); + Mafi.Quantity StoreAsMuchAs(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, bool doNotReport = false); + void StorePileIgnoreCapacity(Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Factory.Transports.MixedPile pile); + Mafi.Quantity TransferMemberTo(Mafi.Core.Entities.Static.IMixedProductBuffer target, Mafi.Core.Products.ProductProto member, Mafi.Quantity quantity, bool doNotReport); + bool HasMixedBreakdown { get; } + int MixedMemberCount { get; } + }
IMixedProductBufferExtensions class added + public static class IMixedProductBufferExtensions { + public static Mafi.Quantity RemoveAsMuchAs(this Mafi.Core.Entities.Static.IMixedProductBuffer buffer, Mafi.Core.ProductQuantity productQuantity, bool doNotReport = false); + public static Mafi.Quantity RemoveAsMuchAs_DoNotReport(this Mafi.Core.Entities.Static.IMixedProductBuffer buffer, Mafi.Core.ProductQuantity productQuantity); + public static Mafi.Quantity RemoveAsMuchAs_DoNotReport(this Mafi.Core.Entities.Static.IMixedProductBuffer buffer, Mafi.Core.Products.ProductProto product, Mafi.Quantity maxQuantity); + public static void StoreAllIgnoreCapacity(this Mafi.Core.Entities.Static.IMixedProductBuffer buffer, Mafi.Core.ProductQuantity productQuantity); + public static Mafi.Quantity StoreAsMuchAs(this Mafi.Core.Entities.Static.IMixedProductBuffer buffer, Mafi.Core.ProductQuantity productQuantity, bool doNotReport = false); + public static Mafi.Quantity StoreAsMuchAs_DoNotReport(this Mafi.Core.Entities.Static.IMixedProductBuffer buffer, Mafi.Core.ProductQuantity productQuantity); + public static Mafi.Quantity StoreAsMuchAs_DoNotReport(this Mafi.Core.Entities.Static.IMixedProductBuffer buffer, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); + }
IPlainProductBuffer interface added + public interface IPlainProductBuffer : Mafi.Core.Entities.Static.IProductBuffer, Mafi.Core.Entities.Static.IProductBufferReadOnly { + Mafi.Quantity RemoveAsMuchAs(Mafi.Quantity maxQuantity, bool doNotReport = false); + void StoreAllIgnoreCapacity(Mafi.Quantity quantity); + Mafi.Quantity StoreAsMuchAs(Mafi.Quantity quantity, bool doNotReport = false); + }
IPlainProductBufferExtensions class added + public static class IPlainProductBufferExtensions { + public static bool CanRemove(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity quantity); + public static bool CanStore(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity quantity); + public static Mafi.Quantity RemoveAsMuchAsReturnLeft(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity maxQuantity); + public static Mafi.Quantity RemoveAsMuchAs_DoNotReport(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity maxQuantity); + public static void RemoveExactly(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity quantity); + public static Mafi.Quantity StoreAsMuchAs(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Core.ProductQuantity productQuantity); + public static void StoreAsMuchAsFrom(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Core.Entities.Static.IPlainProductBuffer sourceBuffer, Mafi.Quantity maxQuantity); + public static Mafi.Quantity StoreAsMuchAsReturnStored(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity quantity); + public static Mafi.Quantity StoreAsMuchAs_DoNotReport(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity quantity); + public static void StoreExactly(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity quantity); + public static bool TryRemove(this Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Quantity quantity); + }
IProductBuffer interface changed public interface IProductBuffer { + Mafi.Core.Entities.Static.IPlainProductBuffer AsPlainBuffer(); + bool CanRemove(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); + bool CanStore(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); + void ClearAndStoreProduct(Mafi.Core.Economy.IAssetTransactionManager atm); + Mafi.Quantity RemoveAll(); + Mafi.Quantity RemoveAndDestroyAsMuchAs(Mafi.Core.Products.IProductsManager productsManager, Mafi.Quantity maxQuantity, Mafi.Core.Products.DestroyReason reason, Mafi.Option<Mafi.Core.Prototypes.Proto> destroyer = default); - Mafi.Quantity RemoveAsMuchAs(Mafi.Quantity maxQuantity); + Mafi.Quantity SendAsMuchAsToPort(Mafi.Core.Ports.Io.IoPortData port); - Mafi.Quantity StoreAsMuchAs(Mafi.Quantity quantity); + Mafi.Quantity TransferTo(Mafi.Core.Entities.Static.IProductBuffer target, Mafi.Quantity quantity, bool doNotReport, bool ignoreTargetCapacity = false); }
IVirtualBufferProvider interface changed public interface IVirtualBufferProvider { - Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer( + Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer( Mafi.Core.Products.ProductProto product, Mafi.Option<Mafi.Core.Entities.IEntity> entity, ); }
IVirtualBuffersMap interface changed public interface IVirtualBuffersMap { - Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer( + Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer( Mafi.Core.Products.ProductProto proto, Mafi.Core.Entities.IEntity entity, ); }
ProductBuffer class changed public class ProductBuffer { + : Mafi.Core.Entities.Static.IMixedProductBuffer + : Mafi.Core.Entities.Static.IPlainProductBuffer + public void AdvanceMixedMemberRotation(); + public Mafi.Core.Entities.Static.IPlainProductBuffer AsPlainBuffer(); + public bool CanRemove(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); + [System.ObsoleteAttribute("Use CanStore(product, quantity).")] public bool CanStore(Mafi.Core.ProductQuantity productQuantity); + public bool CanStore(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); + public Mafi.Quantity Cheat_CreateAsMuchAs(Mafi.Core.Products.IProductsManager productsManager, Mafi.Quantity quantity, Mafi.Option<Mafi.Core.Prototypes.Proto> creator = default); + public Mafi.Quantity Cheat_FillToCapacity(Mafi.Core.Products.IProductsManager productsManager, Mafi.Option<Mafi.Core.Prototypes.Proto> creator = default); + [System.ObsoleteAttribute("Use RemoveAll instead.")] public Mafi.Quantity Clear(); + public void ClearAndStoreProduct(Mafi.Core.Economy.IAssetTransactionManager atm); + public void GetMixedBreakdown(Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity> result); + public void GetMixedBreakdown(ref Mafi.Collections.LystStruct<Mafi.Core.ProductQuantity> result); + public void GetMixedBreakdown(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public int GetMixedBreakdown(ref System.Collections.Generic.KeyValuePair<Mafi.Core.Products.ProductSlimId, Mafi.Quantity>[] result, int startIndex = 0); + public Mafi.Quantity GetMixedBreakdownTotal(); + public Mafi.Quantity GetQuantityOfMixedMember(Mafi.Core.Products.ProductProto member); + public Mafi.Quantity RemoveAndDestroyAsMuchAs(Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Products.ProductProto product, Mafi.Quantity maxQuantity, Mafi.Core.Products.DestroyReason reason, Mafi.Option<Mafi.Core.Prototypes.Proto> destroyer = default); + public Mafi.Quantity RemoveAndDestroyAsMuchAs(Mafi.Core.Products.IProductsManager productsManager, Mafi.Quantity maxQuantity, Mafi.Core.Products.DestroyReason reason, Mafi.Option<Mafi.Core.Prototypes.Proto> destroyer = default); + public Mafi.Quantity RemoveAsMuchAs(Mafi.Core.Products.ProductProto product, Mafi.Quantity maxQuantity, bool doNotReport = false); + public Mafi.Quantity RemoveAsMuchAs(Mafi.Quantity maxQuantity, Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> removedMembers); + public Mafi.Quantity RemoveAsMuchAs(Mafi.Quantity maxQuantity, bool doNotReport = false); + [System.ObsoleteAttribute("Use RemoveAsMuchAs(maxQuantity, doNotReport: true).")] public Mafi.Quantity RemoveAsMuchAs_DoNotReport(Mafi.Quantity maxQuantity); + public Mafi.Quantity RemoveAsMuchAs_DropMembersProportionally(Mafi.Quantity maxQuantity); + public Mafi.Quantity SendAsMuchAsToPort(Mafi.Core.Ports.Io.IoPortData port); + public Mafi.Quantity SendUntilRefused<TState>(TState state, Mafi.Quantity maxQuantity, bool stopOnPartialAccept, Mafi.Core.Entities.Static.ProductBuffer.OfferHandler<TState> accept); + public void StoreAllIgnoreCapacity(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); + public Mafi.Quantity StoreAsMuchAs(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, bool doNotReport = false); + public Mafi.Quantity StoreAsMuchAs(Mafi.Quantity quantity, bool doNotReport = false); + [System.ObsoleteAttribute("Use StoreAsMuchAs(quantity, doNotReport: true).")] public Mafi.Quantity StoreAsMuchAs_DoNotReport(Mafi.Quantity quantity); + public void StorePileIgnoreCapacity(Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Factory.Transports.MixedPile pile); + public Mafi.Quantity TransferMemberTo(Mafi.Core.Entities.Static.IMixedProductBuffer target, Mafi.Core.Products.ProductProto member, Mafi.Quantity quantity, bool doNotReport); + public Mafi.Quantity TransferTo(Mafi.Core.Entities.Static.IProductBuffer target, Mafi.Quantity quantity, bool doNotReport, bool ignoreTargetCapacity = false); + public bool HasMixedBreakdown { get; } + public int MixedMemberCount { get; } + public delegate Mafi.Quantity OfferHandler<in TState>(TState state, Mafi.Core.ProductQuantity offer, out bool doNotReport); }
ProductBufferExtensions class changed public static class ProductBufferExtensions { public static bool CanRemove( this Mafi.Core.Entities.Static.IProductBuffer buffer, - Mafi.Quantity quantity, + Mafi.Core.ProductQuantity productQuantity, ); public static bool CanStore( this Mafi.Core.Entities.Static.IProductBuffer buffer, - Mafi.Quantity quantity, + Mafi.Core.ProductQuantity productQuantity, ); + public static Mafi.Quantity RemoveAndDestroyAll(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Products.DestroyReason reason, Mafi.Option<Mafi.Core.Prototypes.Proto> destroyer = default); - public static Mafi.Quantity RemoveAsMuchAsReturnLeft(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Quantity maxQuantity); - public static void RemoveExactly(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Quantity quantity); + public static Mafi.Quantity SendAsMuchAsToPort(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Ports.Io.IoPortData> outputPorts); + public static Mafi.Quantity SendAsMuchAsToPort(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Ports.Io.IoPortData> outputPorts, ref int lastUsedPortIndex); + public static Mafi.Quantity SendAsMuchAsToPort(this Mafi.Core.Entities.Static.ProductBuffer buffer, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Ports.Io.IoPortData> outputPorts); + public static Mafi.Quantity SendAsMuchAsToPort(this Mafi.Core.Entities.Static.ProductBuffer buffer, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Ports.Io.IoPortData> outputPorts, ref int lastUsedPortIndex); - public static Mafi.Quantity StoreAsMuchAs(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Core.ProductQuantity productQuantity); - public static void StoreAsMuchAsFrom(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Core.Entities.Static.IProductBuffer sourceBuffer, Mafi.Quantity maxQuantity); - public static Mafi.Quantity StoreAsMuchAsReturnStored(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Quantity quantity); - public static void StoreExactly(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Quantity quantity); - public static bool TryRemove(this Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Quantity quantity); }
ProductBufferOfferExtensions class added + public static class ProductBufferOfferExtensions { + public static Mafi.Quantity SendUntilRefused(this Mafi.Core.Entities.Static.ProductBuffer buffer, Mafi.Core.Buildings.Storages.Storage receiver); + public static Mafi.Quantity SendUntilRefused(this Mafi.Core.Entities.Static.ProductBuffer buffer, Mafi.Core.Ports.Io.IoPortData port, Mafi.Quantity maxQuantity); + }
RestrictedProtoAdditionValidator class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class RestrictedProtoAdditionValidator : Mafi.Core.Entities.Validators.IEntityAdditionValidator, Mafi.Core.Entities.Validators.IEntityAdditionValidator<Mafi.Core.Entities.Static.Layout.LayoutEntityAddRequest> { + public RestrictedProtoAdditionValidator(Mafi.Core.Entities.EntitiesManager entitiesManager, Mafi.Core.PromoCode.PromoCodeManager promoCodeManager); + public Mafi.Core.Entities.Validators.EntityValidationResult CanAdd(Mafi.Core.Entities.Static.Layout.LayoutEntityAddRequest addRequest); + public Mafi.Core.Entities.Validators.EntityValidatorPriority Priority { get; } + }
StaticEntityOceanReservationManagerV2 class changed public class StaticEntityOceanReservationManagerV2 { + public bool OverlapsAnyReservedArea(Mafi.Core.Terrain.RectangleTerrainArea2i area); }
VirtualBuffersMap class changed public class VirtualBuffersMap { - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer( + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer( Mafi.Core.Products.ProductProto proto, Mafi.Core.Entities.IEntity entity, ); }
}
namespace Mafi.Core.Entities.Static.Commands {
BatchCreateStaticEntitiesCmd class changed public class BatchCreateStaticEntitiesCmd { + [Mafi.Serialization.OnlyForSaveCompatibilityAttribute] public readonly bool IsFree; + public BatchCreateStaticEntitiesCmd(Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.EntityConfigData> configData, Mafi.Core.Entities.Static.Commands.BuildMiniZippersMode buildMiniZippers = DeferToProto, bool allowValidationSuppression = false, bool applyConfiguration = false); + [System.ObsoleteAttribute("isFree is ignored")] public BatchCreateStaticEntitiesCmd( Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.EntityConfigData> configData, - Mafi.Core.Entities.Static.Commands.BuildMiniZippersMode buildMiniZippers = DeferToProto, + Mafi.Core.Entities.Static.Commands.BuildMiniZippersMode buildMiniZippers, - bool isFree = false, + bool isFree, bool allowValidationSuppression = false, bool applyConfiguration = false, ); }
CreateStaticEntityCmd class changed public class CreateStaticEntityCmd { + [Mafi.Serialization.OnlyForSaveCompatibilityAttribute] public readonly bool IsFree; + public CreateStaticEntityCmd(Mafi.Core.Entities.Static.StaticEntityProto.ID protoId, Mafi.Core.TileTransform transform, bool allowValidationSuppression = false); + [System.ObsoleteAttribute("isFree is ignored")] public CreateStaticEntityCmd( Mafi.Core.Entities.Static.StaticEntityProto.ID protoId, Mafi.Core.TileTransform transform, - bool isFree = false, + bool isFree, bool allowValidationSuppression = false, ); }
FinishBuildOfStaticEntityCheatCmd class added + [Mafi.Core.Input.CheatCommandAttribute] + [Mafi.Serialization.GenerateSerializer] + public class FinishBuildOfStaticEntityCheatCmd : Mafi.Core.Input.InputCommand<Mafi.Core.EntityId> { + public readonly Mafi.Core.EntityId EntityId; + public FinishBuildOfStaticEntityCheatCmd(Mafi.Core.EntityId id); + public static Mafi.Core.Entities.Static.Commands.FinishBuildOfStaticEntityCheatCmd Deserialize(Mafi.Serialization.BlobReader reader); + public static void Serialize(Mafi.Core.Entities.Static.Commands.FinishBuildOfStaticEntityCheatCmd value, Mafi.Serialization.BlobWriter writer); + }
FinishBuildOfStaticEntityCmd class changed public class FinishBuildOfStaticEntityCmd { + [Mafi.Serialization.OnlyForSaveCompatibilityAttribute] public readonly bool PayWithUnity; + public FinishBuildOfStaticEntityCmd(Mafi.Core.EntityId id); + [System.ObsoleteAttribute("payWithUnity is ignored, use FinishBuildOfStaticEntityCheatCmd to finish without paying")] - public FinishBuildOfStaticEntityCmd(Mafi.Core.EntityId id, bool payWithUnity = false); + public FinishBuildOfStaticEntityCmd(Mafi.Core.EntityId id, bool payWithUnity); }
}
namespace Mafi.Core.Entities.Static.Layout {
EntityLayoutParams class changed public class EntityLayoutParams { + public readonly bool FloatsOnOcean; + [System.ObsoleteAttribute("Kept for mods compiled against the previous signature, use the constructor with floatsOnOcean.")] public EntityLayoutParams( - System.Predicate<Mafi.Core.Entities.Static.Layout.LayoutTile> ignoreTilesForCore = null, + System.Predicate<Mafi.Core.Entities.Static.Layout.LayoutTile> ignoreTilesForCore, - System.Collections.Generic.IEnumerable<Mafi.Core.Entities.Static.Layout.CustomLayoutToken> customTokens = null, + System.Collections.Generic.IEnumerable<Mafi.Core.Entities.Static.Layout.CustomLayoutToken> customTokens, - bool portsCanOnlyConnectToTransports = false, + bool portsCanOnlyConnectToTransports, - Mafi.Core.Prototypes.Proto.ID? hardenedFloorSurfaceId = null, + Mafi.Core.Prototypes.Proto.ID? hardenedFloorSurfaceId, - string[] customVertexDataLayout = null, + string[] customVertexDataLayout, - System.Func<Mafi.Core.Entities.Static.Layout.TerrainVertexRel, char, Mafi.Core.Entities.Static.Layout.TerrainVertexRel> customVertexTransformFn = null, + System.Func<Mafi.Core.Entities.Static.Layout.TerrainVertexRel, char, Mafi.Core.Entities.Static.Layout.TerrainVertexRel> customVertexTransformFn, - System.Func<Mafi.Vector2i, Mafi.ThicknessTilesI> customMaxTerrainHeightFn = null, + System.Func<Mafi.Vector2i, Mafi.ThicknessTilesI> customMaxTerrainHeightFn, - int? customCollapseVerticesThreshold = null, + int? customCollapseVerticesThreshold, - Mafi.Core.ThicknessIRange? customPlacementRange = null, + Mafi.Core.ThicknessIRange? customPlacementRange, - Mafi.Option<System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<char, int>>> customPortHeights = default, + Mafi.Option<System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<char, int>>> customPortHeights, - bool enforceEmptySurface = false, + bool enforceEmptySurface, - Mafi.ThicknessTilesI? minHeightAboveOcean = null, + Mafi.ThicknessTilesI? minHeightAboveOcean, - System.Func<Mafi.RelTile2i, Mafi.Core.Entities.Static.Layout.LayoutTokenSpec, Mafi.Core.Entities.Static.Layout.LayoutTokenSpec> tokenPostProcesssor = null, + System.Func<Mafi.RelTile2i, Mafi.Core.Entities.Static.Layout.LayoutTokenSpec, Mafi.Core.Entities.Static.Layout.LayoutTokenSpec> tokenPostProcesssor, ); + public EntityLayoutParams(System.Predicate<Mafi.Core.Entities.Static.Layout.LayoutTile> ignoreTilesForCore = null, System.Collections.Generic.IEnumerable<Mafi.Core.Entities.Static.Layout.CustomLayoutToken> customTokens = null, bool portsCanOnlyConnectToTransports = false, Mafi.Core.Prototypes.Proto.ID? hardenedFloorSurfaceId = null, string[] customVertexDataLayout = null, System.Func<Mafi.Core.Entities.Static.Layout.TerrainVertexRel, char, Mafi.Core.Entities.Static.Layout.TerrainVertexRel> customVertexTransformFn = null, System.Func<Mafi.Vector2i, Mafi.ThicknessTilesI> customMaxTerrainHeightFn = null, int? customCollapseVerticesThreshold = null, Mafi.Core.ThicknessIRange? customPlacementRange = null, Mafi.Option<System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<char, int>>> customPortHeights = default, bool enforceEmptySurface = false, Mafi.ThicknessTilesI? minHeightAboveOcean = null, System.Func<Mafi.RelTile2i, Mafi.Core.Entities.Static.Layout.LayoutTokenSpec, Mafi.Core.Entities.Static.Layout.LayoutTokenSpec> tokenPostProcesssor = null, bool floatsOnOcean = false); }
LayoutEntityAddRequest class changed public class LayoutEntityAddRequest { + public bool IsActualAdd { get; } }
}
namespace Mafi.Core.Entities.Static.Layout.Upgrade {
LayoutEntityUpgrader<TProto, TEntity> class changed public class LayoutEntityUpgrader<TProto, TEntity> { - where TProto : Mafi.Core.Prototypes.IProtoWithUpgrade, Mafi.Core.Entities.Static.Layout.LayoutEntityProto + where TProto : Mafi.Core.Entities.Static.Layout.LayoutEntityProto, Mafi.Core.Prototypes.IProtoWithUpgrade }
}
namespace Mafi.Core.Environment {
AirPollutionManager class changed public class AirPollutionManager { + public static readonly Mafi.Percent APPROX_HEALTH_PENALTY_PER_QUANTITY; - public void EmitPollution(Mafi.Core.Environment.AirPollutionCategory category, Mafi.PartialQuantity pq); + public Mafi.PartialQuantity EmitPollution(Mafi.Core.Environment.AirPollutionCategory category, Mafi.PartialQuantity pq); - public void EmitShipPollution(Mafi.PartialQuantity quantity); + public Mafi.PartialQuantity EmitShipPollution(Mafi.PartialQuantity quantity); - public void EmitTrainsPollution(Mafi.PartialQuantity quantity); + public Mafi.PartialQuantity EmitTrainsPollution(Mafi.PartialQuantity quantity); - public void EmitVehiclePollution(Mafi.PartialQuantity quantity); + public Mafi.PartialQuantity EmitVehiclePollution(Mafi.PartialQuantity quantity); - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer( + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer( Mafi.Core.Products.ProductProto product, Mafi.Option<Mafi.Core.Entities.IEntity> entity, ); }
EntityPollutionTracker class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + [Mafi.Serialization.GenerateSerializer] + public sealed class EntityPollutionTracker { + public EntityPollutionTracker(Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents); + public static Mafi.Core.Environment.EntityPollutionTracker Deserialize(Mafi.Serialization.BlobReader reader); + public void GetAllAirPollutionPerMonthForOverlays(Mafi.Collections.Lyst<System.Collections.Generic.KeyValuePair<Mafi.Core.Entities.IEntity, Mafi.Fix64>> outAmounts); + public void GetAllRadiationPerMonthForOverlays(Mafi.Collections.Lyst<System.Collections.Generic.KeyValuePair<Mafi.Core.Entities.IEntity, Mafi.Fix64>> outAmounts); + public void ReportEmitted(Mafi.Core.Environment.IExplicitlyPollutingEntity entity, Mafi.PartialQuantity airPollution); + public static void Serialize(Mafi.Core.Environment.EntityPollutionTracker value, Mafi.Serialization.BlobWriter writer); + }
IExplicitlyPollutingEntity interface added + public interface IExplicitlyPollutingEntity : Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IObjectWithTitle, Mafi.Serialization.IIsSafeAsHashKey { + }
IRadiationManager interface changed public interface IRadiationManager { + void ReportProductsMoved(Mafi.Core.Entities.IEntity source, Mafi.Core.Entities.IEntity receiver); + void ReportRadioactiveProductReceived(Mafi.Core.Entities.IEntity receiver, Mafi.Core.Products.ProductProto product); - void ReportReactorRadiationLeak(); + void ReportReactorRadiationLeak(Mafi.Core.Entities.IEntity reactor); - void ReportSafelyStoredQuantityChange(Mafi.Core.Products.ProductProto product, Mafi.Quantity diff); }
IShieldedEntity interface added + public interface IShieldedEntity : Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IEntityWithProducts, Mafi.Core.Entities.IObjectWithTitle, Mafi.Serialization.IIsSafeAsHashKey { + void ForEachShieldedProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + bool HasShielding { get; } + }
RadiationManager class changed + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_hasUnsafeRadiation", 338, typeof(bool), 336)] + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_scanCycle", 338, typeof(int), 336)] + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_scanTick", 338, typeof(int), 336)] public class RadiationManager { public RadiationManager( Mafi.Core.Prototypes.ProtosDb protos, Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Population.PopsHealthManager popsHealthManager, Mafi.Core.Stats.StatsManager statsManager, + Mafi.Core.Entities.IEntitiesManager entitiesManager, + Mafi.Core.Environment.EntityPollutionTracker pollutionTracker, + Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, ); + public void ReportProductsMoved(Mafi.Core.Entities.IEntity source, Mafi.Core.Entities.IEntity receiver); + public void ReportRadioactiveProductReceived(Mafi.Core.Entities.IEntity receiver, Mafi.Core.Products.ProductProto product); - public void ReportReactorRadiationLeak(); + public void ReportReactorRadiationLeak(Mafi.Core.Entities.IEntity reactor); - public void ReportSafelyStoredQuantityChange(Mafi.Core.Products.ProductProto product, Mafi.Quantity diff); - public System.Collections.Generic.IReadOnlyDictionary<Mafi.Core.Products.ProductProto, Mafi.Quantity> SafelyStoredProducts { get; } }
WaterPollutionManager class changed public class WaterPollutionManager { + public static readonly Mafi.Percent HEALTH_PENALTY_PER_QUANTITY; - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer( + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer( Mafi.Core.Products.ProductProto product, Mafi.Option<Mafi.Core.Entities.IEntity> entity, ); }
WeatherProto class changed public class WeatherProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> SoundPrefabPath; } }
}
namespace Mafi.Core.Factory {
EntityWithUiRecipesInUseExtensions class added + public static class EntityWithUiRecipesInUseExtensions { + public static bool IsUiRecipeInUseBySlots(this Mafi.Core.Entities.Static.IEntityWithMultipleProductsToAssign entity, Mafi.Core.Factory.Recipes.IRecipeForUi recipe); + }
IComputingManager interface changed public interface IComputingManager { + Mafi.Fix64 GetAvgGenerationPerMonthForOverlays(Mafi.Core.Factory.ComputingPower.IComputingGenerator generator); }
IEntityWithInputsOutsideUiRecipes interface added + public interface IEntityWithInputsOutsideUiRecipes : Mafi.Core.Factory.IEntityWithUiRecipesInUse { + bool IsInputInUseOutsideUiRecipes(Mafi.Core.Products.ProductProto product); + }
IEntityWithUiRecipesInUse interface added + public interface IEntityWithUiRecipesInUse { + bool IsUiRecipeInUse(Mafi.Core.Factory.Recipes.IRecipeForUi recipe); + }
ProductivityCounter struct changed public struct ProductivityCounter { + public void ReportNoCategory(); + public readonly int OngoingMonthTicks { get; } }
ProductivityCounterHistory class changed public class ProductivityCounterHistory { + public static Mafi.Core.Factory.ProductivityCounterHistory CreateAverageOf(Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.Factory.ProductivityCounterHistory> histories); + public int FullMonthlyRecordsCount { get; } + public int YearlyRecordsCount { get; } public struct Data { + public readonly int GetProductive(Mafi.Core.Factory.ProductivityCounterLabels labels); + public readonly int Total { get; } } }
ProductivityCounterLabels class changed public class ProductivityCounterLabels { + public readonly Mafi.Core.Factory.ProductivityLabelCategory? NoCategory; + public readonly Mafi.Localization.LocStr? PercentageTooltip; public ProductivityCounterLabels( Mafi.Core.Factory.ProductivityLabelCategory categoryA, Mafi.Core.Factory.ProductivityLabelCategory categoryB, Mafi.Core.Factory.ProductivityLabelCategory categoryC, Mafi.Core.Factory.ProductivityLabelCategory categoryD, + Mafi.Core.Factory.ProductivityLabelCategory? noCategory = null, + Mafi.Localization.LocStr? percentageTooltip = null, ); }
}
namespace Mafi.Core.Factory.ComputingPower {
ComputingConsumer class changed public class ComputingConsumer { + public void CloseInfoOverlayBucket(); + public Mafi.Fix64 AvgConsumptionPerMonthForOverlays { get; } }
ComputingConsumerExtensions class changed public static class ComputingConsumerExtensions { + public static bool UsesComputingForOverlays(this Mafi.Core.Factory.ComputingPower.IComputingConsumerReadonly consumer); }
ComputingManager class changed public class ComputingManager { public ComputingManager( Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Entities.Static.IConstructionManager constructionManager, Mafi.Core.Stats.StatsManager statsManager, Mafi.Core.Products.VirtualProductProto computingProto, + Mafi.Core.Simulation.ICalendar calendar, ); + public Mafi.Fix64 GetAvgGenerationPerMonthForOverlays(Mafi.Core.Factory.ComputingPower.IComputingGenerator generator); }
IComputingConsumerInternal interface changed public interface IComputingConsumerInternal { + void CloseInfoOverlayBucket(); }
IComputingConsumerReadonly interface changed public interface IComputingConsumerReadonly { + Mafi.Fix64 AvgConsumptionPerMonthForOverlays { get; } }
IComputingGenerator interface changed public interface IComputingGenerator { + Mafi.Computing CurrentComputingGeneration { get; } }
}
namespace Mafi.Core.Factory.Datacenters {
DataCenter class changed public class DataCenter { + public Mafi.Computing CurrentComputingGeneration { get; } }
}
namespace Mafi.Core.Factory.ElectricPower {
ElectricityConsumer class changed public class ElectricityConsumer { + public void CloseInfoOverlayBucket(); + public Mafi.Fix64 AvgConsumptionPerMonthForOverlays { get; } }
ElectricityConsumerExtensions class changed public static class ElectricityConsumerExtensions { + public static bool UsesElectricityForOverlays(this Mafi.Core.Factory.ElectricPower.IElectricityConsumerReadonly consumer); }
ElectricityManager class changed public sealed class ElectricityManager { public ElectricityManager( Mafi.Core.Factory.ElectricPower.IElectricityConfig electricityConfig, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Core.Products.VirtualProductProto electricityProto, Mafi.Core.Stats.StatsManager statsManager, + Mafi.Core.Simulation.ICalendar calendar, ); }
IElectricityConsumerInternal interface changed public interface IElectricityConsumerInternal { + void CloseInfoOverlayBucket(); }
IElectricityConsumerReadonly interface changed public interface IElectricityConsumerReadonly { + Mafi.Fix64 AvgConsumptionPerMonthForOverlays { get; } }
IElectricityGeneratorRegistrator interface changed public interface IElectricityGeneratorRegistrator { + Mafi.Fix64 GetAvgGenerationPerMonthForOverlays(Mafi.GameDate today); }
ISolarPanelsManager interface changed public interface ISolarPanelsManager { + Mafi.Fix64 GetAvgGenerationPerMonthForOverlays(Mafi.Core.Factory.ElectricPower.ISolarPanelEntity solarPanel); }
SolarPanelsManager class changed public sealed class SolarPanelsManager { public SolarPanelsManager( Mafi.Core.Factory.ElectricPower.ElectricityManager electricityManager, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.Environment.IWeatherManager weatherManager, Mafi.Core.PropertiesDb.IPropertiesDb propertiesDb, + Mafi.Core.Simulation.ICalendar calendar, ); + public Mafi.Fix64 GetAvgGenerationPerMonthForOverlays(Mafi.Core.Factory.ElectricPower.ISolarPanelEntity solarPanel); }
}
namespace Mafi.Core.Factory.Lifts {
Lift class changed public class Lift { + : Mafi.Core.Entities.IEntityWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + public void GetBreakdownByPlaceholder(Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity>> result); }
}
namespace Mafi.Core.Factory.Machines {
ClearRecipeProductsCmd class changed + [System.ObsoleteAttribute("Use ClearUnusedMachineBuffersCmd")] public class ClearRecipeProductsCmd { }
Machine class changed public class Machine { + : Mafi.Core.Entities.IEntityWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + public void GetInputBufferBreakdown(Mafi.Core.Products.MixedMaterialCategory category, Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public void GetOutputBufferBreakdown(Mafi.Core.Products.MixedMaterialCategory category, Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); - public Mafi.Core.Entities.SoundParams? SoundParams { get; } protected readonly struct RecipeProductQuantity { - public readonly Mafi.Core.Entities.Static.IProductBuffer Buffer; + public readonly Mafi.Core.Entities.Static.IPlainProductBuffer Buffer; + public readonly Mafi.Option<Mafi.Core.Entities.Static.IMixedProductBuffer> CompactableInput; + public readonly Mafi.Option<Mafi.Core.Products.MixedMaterialCategory> CompactedTarget; public RecipeProductQuantity( Mafi.Core.Factory.Machines.MachineRecipeBinding binding, Mafi.Quantity quantity, - Mafi.Core.Entities.Static.IProductBuffer buffer, + Mafi.Core.Entities.Static.IPlainProductBuffer buffer, + Mafi.Option<Mafi.Core.Products.MixedMaterialCategory> compactedTarget = default, ); } protected readonly struct RecipeWrapper { + public readonly bool HasCompactableInput; } }
MachineProto class changed public class MachineProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> MachineSoundPrefabPath; } }
MachineProtoBuilder class changed public class MachineProtoBuilder { public class StateBase<T> { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] protected Mafi.Option<string> MachineSoundPrefabPath; + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public T SetMachineSound(string machineSoundPrefabPath); } }
MachineRecipeBinding struct changed public readonly struct MachineRecipeBinding { + public Mafi.Quantity RecyclablesOutputMinCapacity { get; } }
}
namespace Mafi.Core.Factory.MechanicalPower {
IShaftBuffer interface changed public interface IShaftBuffer { + : Mafi.Core.Entities.Static.IPlainProductBuffer }
Shaft class changed public class Shaft { + public void StoreAllIgnoreCapacity(Mafi.Quantity quantity); }
ShaftManager class changed public class ShaftManager { - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer( + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer( Mafi.Core.Products.ProductProto product, Mafi.Option<Mafi.Core.Entities.IEntity> entity, ); }
}
namespace Mafi.Core.Factory.NuclearReactors {
NuclearReactor class changed public class NuclearReactor { + : Mafi.Core.Environment.IShieldedEntity + : Mafi.Core.Factory.IEntityWithUiRecipesInUse + void Mafi.Core.Entities.IEntityWithProducts.ForEachHeldProduct<TConsumer>(TConsumer consumer); + void Mafi.Core.Environment.IShieldedEntity.ForEachShieldedProduct<TConsumer>(TConsumer consumer); + bool Mafi.Core.Factory.IEntityWithUiRecipesInUse.IsUiRecipeInUse(Mafi.Core.Factory.Recipes.IRecipeForUi recipe); - public Mafi.Core.Entities.Static.IProductBuffer CoolantInBuffer { get; } + public Mafi.Core.Entities.Static.IPlainProductBuffer CoolantInBuffer { get; } - public Mafi.Core.Entities.Static.IProductBuffer CoolantOutBuffer { get; } + public Mafi.Core.Entities.Static.IPlainProductBuffer CoolantOutBuffer { get; } + bool Mafi.Core.Environment.IShieldedEntity.HasShielding { get; } - public Mafi.Core.Entities.SoundParams? SoundParams { get; } }
NuclearReactorProto class changed public class NuclearReactorProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Option<string> SoundPrefabPath; } }
}
namespace Mafi.Core.Factory.Recipes {
RecipeProto class changed public class RecipeProto { + [System.ObsoleteAttribute("No longer used, it has no effect.")] public readonly bool DisableSourceProductsConversionLoss; + public readonly Mafi.Option<Mafi.Core.Factory.Recipes.RecipeOutput> RecyclablesOutput; + [System.ObsoleteAttribute("Use the constructor with recyclablesOutput.")] public RecipeProto( Mafi.Core.Factory.Recipes.RecipeProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Factory.Recipes.RecipeInput> allInputs, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Factory.Recipes.RecipeOutput> allOutputs, - Mafi.Core.Products.DestroyReason productsDestroyReason = General, + Mafi.Core.Products.DestroyReason productsDestroyReason, - bool disableSourceProductsConversionLoss = false, + bool disableSourceProductsConversionLoss, - Mafi.Percent? powerMultiplier = null, + Mafi.Percent? powerMultiplier, ); + public RecipeProto(Mafi.Core.Factory.Recipes.RecipeProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Factory.Recipes.RecipeInput> allInputs, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Factory.Recipes.RecipeOutput> allOutputs, Mafi.Core.Products.DestroyReason productsDestroyReason = General, bool disableSourceProductsConversionLoss = false, Mafi.Percent? powerMultiplier = null, Mafi.Option<Mafi.Core.Factory.Recipes.RecipeOutput> recyclablesOutput = default); }
RecipeProtoBuilder class changed public sealed class RecipeProtoBuilder { public class State { + [System.ObsoleteAttribute("No longer used, it has no effect.")] public Mafi.Core.Factory.Recipes.RecipeProtoBuilder.State DisableSourceProductsConversionLoss(); + public Mafi.Core.Factory.Recipes.RecipeProtoBuilder.State EnableRecyclablesOutput(); } }
}
namespace Mafi.Core.Factory.Sorters {
Sorter class changed public class Sorter { + : Mafi.Core.Entities.IEntityWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; }
}
namespace Mafi.Core.Factory.Transports {
BuildTransportCmd class changed public class BuildTransportCmd { + [Mafi.Serialization.OnlyForSaveCompatibilityAttribute] public readonly bool IsFree; + public BuildTransportCmd(Mafi.Core.Entities.Static.StaticEntityProto.ID protoId, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Tile3i> pivotPositions, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Tile2i> pillarHints, Mafi.Direction903d? startDirection, Mafi.Direction903d? endDirection, bool disablePortSnapping, bool allowDirectConnection = false); + [System.ObsoleteAttribute("isFree is ignored")] public BuildTransportCmd(Mafi.Core.Entities.Static.StaticEntityProto.ID protoId, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Tile3i> pivotPositions, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Tile2i> pillarHints, Mafi.Direction903d? startDirection, Mafi.Direction903d? endDirection, bool disablePortSnapping, bool isFree, bool allowDirectConnection = false); }
ExitedTransportProduct struct added + public readonly struct ExitedTransportProduct { + public readonly Mafi.SimStep ExitStep; + public readonly Mafi.Core.Factory.Transports.TransportedProductMutable Product; + public ExitedTransportProduct(Mafi.Core.Factory.Transports.TransportedProductMutable product, Mafi.SimStep exitStep); + }
MixedPile struct added + [Mafi.Serialization.GenerateSerializer] + public readonly struct MixedPile { + public const int MAX_SLOTS = 3; + public static readonly Mafi.Core.Factory.Transports.MixedPile None; + public readonly Mafi.Core.Products.ProductProto Product; + [Mafi.Serialization.LoadCtorAttribute] + public MixedPile(Mafi.Core.Products.ProductProto product, uint packed); + public void AggregateByPlaceholderInto(Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity>> result); + public void AggregateInto(Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity> target); + public Mafi.Quantity AggregateInto(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> target); + public static Mafi.Core.Factory.Transports.MixedPile CreateHomogeneous(Mafi.Core.Products.ProductProto product, byte memberIndex, int unitCount); + public static Mafi.Core.Factory.Transports.MixedPile Deserialize(Mafi.Serialization.BlobReader reader); + public Mafi.Core.Factory.Transports.MixedPile DropFirst(int count); + public static Mafi.Core.Factory.Transports.MixedPile FromPlain(Mafi.Core.ProductQuantity pq); + public static Mafi.Core.Factory.Transports.MixedPile FromPlain(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); + public static Mafi.Core.Factory.Transports.MixedPile FromPortReceive(Mafi.Core.ProductQuantity pq); + public byte GetSlot(int slot); + public Mafi.Core.Factory.Transports.MixedPile KeepFirst(int count); + public static void SendAsMuchAs(Mafi.Core.Ports.Io.IoPortData port, ref Mafi.Core.Factory.Transports.MixedPile pile, Mafi.Core.Products.IProductsManager productsManager); + public static void Serialize(Mafi.Core.Factory.Transports.MixedPile value, Mafi.Serialization.BlobWriter writer); + public static Mafi.Quantity Stack(ref Mafi.Core.Factory.Transports.MixedPile staged, ref Mafi.Core.Factory.Transports.MixedPile chunk); + public bool CanStackMore { get; } + public bool HasMembers { get; } + public bool IsEmpty { get; } + public bool IsNotEmpty { get; } + public Mafi.Core.ProductQuantity ProductQuantity { get; } + public Mafi.Quantity Quantity { get; } + }
Transport class changed public class Transport { + : Mafi.Core.Entities.IEntityWithProducts + : Mafi.Core.Entities.IEntityWithSoundLine - public Mafi.Core.Economy.AssetValue ClearAndReturnTransportedProducts(); + public Mafi.Quantity ClearTransportedProducts(Mafi.Core.Economy.IAssetTransactionManager atm, Mafi.Core.Factory.Transports.TransportClearMode mode, Mafi.Option<Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity>> clearedTmp = default); + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + public void GetBreakdownByPlaceholder(Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity>> result); + void Mafi.Core.Entities.IEntityWithSoundLine.GetSoundLine(Mafi.Collections.Lyst<Mafi.Tile3f> path); + bool Mafi.Core.Entities.IEntityWithSound.IsSoundOn { get; } + public Mafi.Core.Factory.Transports.ExitedTransportProduct? RecentlyExitedProduct { get; } }
TransportClearMode enum added + public enum TransportClearMode { + Store = 0, + QuickRemove = 1, + DestroyCheated = 2, + DestroyCleared = 3, + DropUnreported = 4, + }
TransportProto class changed public class TransportProto { + public readonly int MaxWaypoints; + public bool ExtendsIntoConnectedEntities { get; } new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string SoundOnBuildPrefabPath; + public static Mafi.Core.Factory.Transports.TransportProto.Gfx CreateEmpty(bool renderProducts); } }
TransportShapeKey struct changed public readonly struct TransportShapeKey { + public readonly bool PadStart; public TransportShapeKey( Mafi.Core.Prototypes.Proto.ID protoId, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Tile3i> pivots, Mafi.Rotation90 canonicalRot, Mafi.RelTile3i canonicalStartDir, Mafi.RelTile3i canonicalEndDir, + bool padStart, ); }
TransportTrajectory class changed public sealed class TransportTrajectory { + public static readonly Mafi.RelTile1f PAD_LENGTH; + [Mafi.Serialization.NewInSaveVersionAttribute(335)] + public readonly bool PadStart; + public static Mafi.Core.Factory.Transports.TransportWpData ComputeWaypointsFromCurve(Mafi.Core.Factory.Transports.TransportProto transportProto, Mafi.Curves.CubicBezierCurve3f curve, Mafi.RelTile3i? padStartDirection, Mafi.RelTile1f? customTransportSpeed = null); + public static Mafi.RelTile1f GetPadStepDistance(int k, int steps, Mafi.RelTile1f stepLength, Mafi.RelTile1f leftover); + public static int GetPadStepsCount(Mafi.RelTile1f stepLength, Mafi.RelTile1f leftover); public static bool TryCreateFromPivots( Mafi.Core.Factory.Transports.TransportProto proto, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Tile3i> pivots, Mafi.RelTile3i? startDirMaybe, Mafi.RelTile3i? endDirMaybe, out Mafi.Core.Factory.Transports.TransportTrajectory trajectory, out string error, bool ignoreSoftConstraints = false, bool allowDenormalizedStartEndDirections = false, + bool padStart = false, ); + public Mafi.Core.Factory.Transports.TransportTrajectory WithPadding(bool padStart); + public Mafi.RelTile1f DistanceFromLastWaypointToCurveEnd { get; } + public int ExitAnimationStepsCount { get; } + public int StartPadWaypointsCount { get; } + public Mafi.RelTile1f StepLength { get; } + public int WaypointsCountExcludingStartPad { get; } }
TransportTrajectoryGeometry class changed public sealed class TransportTrajectoryGeometry { + public readonly Mafi.RelTile1f DistanceFromLastWaypointToCurveEnd; + public readonly int ExitAnimationStepsCount; - public readonly Mafi.RelTile1f Length; + public readonly int StartPadWaypointsCount; + public readonly Mafi.RelTile1f StepLength; public TransportTrajectoryGeometry( Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Factory.Transports.TransportWaypoint> relativeWaypoints, - Mafi.Collections.ImmutableCollections.ImmutableArray<int> curveSegmentWaypointIndices, - Mafi.RelTile1f length, + in Mafi.Core.Factory.Transports.TransportWpData wpData, + int exitAnimationStepsCount, ); + public Mafi.RelTile1f Length { get; } }
TransportWpData struct added + public readonly struct TransportWpData { + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<int> CurveSegmentWaypointIndices; + public readonly Mafi.RelTile1f DistanceFromLastWaypointToCurveEnd; + public readonly int StartPadWaypointsCount; + public readonly Mafi.RelTile1f StepLength; + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Factory.Transports.TransportWaypoint> Waypoints; + public TransportWpData(Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Factory.Transports.TransportWaypoint> waypoints, Mafi.Collections.ImmutableCollections.ImmutableArray<int> curveSegmentWaypointIndices, Mafi.RelTile1f stepLength, Mafi.RelTile1f distanceFromLastWaypointToCurveEnd, int startPadWaypointsCount); + }
TransportedProductMutable struct changed - [Mafi.Utils.ExpectedStructSizeAttribute(8)] + [Mafi.Utils.ExpectedStructSizeAttribute(12)] public struct TransportedProductMutable { + public readonly Mafi.Core.Factory.Transports.MixedPile GetMixedPile(Mafi.Core.Products.ProductProto product); + public void SetFromPile(Mafi.Core.Factory.Transports.MixedPile pile); + public readonly bool HasMembers { get; } }
TransportsCommandsProcessor class changed public sealed class TransportsCommandsProcessor { + [System.ObsoleteAttribute("isFree is ignored")] public bool TryBuildTransportFromConfig(Mafi.Core.Entities.EntityConfigData config, bool applyConfiguration, bool isFree, out string error); + public bool TryBuildTransportFromConfig(Mafi.Core.Entities.EntityConfigData config, bool applyConfiguration, out string error); }
TransportsManager class changed public sealed class TransportsManager { public bool TryCutOutTransport( Mafi.Core.Factory.Transports.Transport transport, Mafi.Tile3i cutOutFrom, Mafi.Tile3i cutOutTo, bool expandCutOverRampsInsteadOfFailing, bool createCutOutTrajectory, out Mafi.Option<Mafi.Core.Factory.Transports.Transport> startSubTransport, out Mafi.Option<Mafi.Core.Factory.Transports.TransportTrajectory> cutOutSubTrajectory, out Mafi.Option<Mafi.Core.Factory.Transports.Transport> endSubTransport, - out Mafi.Core.Economy.AssetValue cutOutProducts, out Mafi.Localization.LocStrFormatted error, ); }
}
namespace Mafi.Core.Factory.Zippers {
MiniZipper class changed + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_delay", 334, typeof(Mafi.Duration))] + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_maxBufferSize", 334, typeof(Mafi.Quantity))] public sealed class MiniZipper { + : Mafi.Core.Entities.IEntityWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + public void GetBreakdownByPlaceholder(Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity>> result); }
ZipBuffProduct struct changed public struct ZipBuffProduct { + [Mafi.Serialization.ChangedTypeInVersionAttribute(334, "MixedPile.FromPlain(ProductQuantity.Deserialize(reader))")] + public readonly Mafi.Core.Factory.Transports.MixedPile Pile; - public readonly Mafi.Core.ProductQuantity ProductQuantity; - public ZipBuffProduct(Mafi.Core.ProductQuantity productQuantity, Mafi.SimStep enqueuedAtStep); + public ZipBuffProduct(Mafi.Core.Factory.Transports.MixedPile pile, Mafi.SimStep enqueuedAtStep); }
Zipper class changed public class Zipper { + : Mafi.Core.Entities.IEntityWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; }
}
namespace Mafi.Core.Game {
ChangeGameDifficultyCmd class changed public class ChangeGameDifficultyCmd { - [Mafi.Serialization.DoNotSaveAttribute] + [Mafi.Serialization.NewInSaveVersionAttribute(341, null, "null")] public readonly Mafi.Core.Game.GameDifficultyConfig NewDifficulty; }
DiffSettingInfo<T> class changed public abstract class DiffSettingInfo<T> { - public readonly Mafi.Localization.LocStrFormatted Tooltip; public DiffSettingInfo( string valueMemberName, - Mafi.Localization.LocStrFormatted title, + Mafi.Localization.LocStr title, - Mafi.Localization.LocStrFormatted tooltip, + Mafi.Localization.LocStr tooltip, T[] options, + Mafi.Option<System.Func<Mafi.Localization.LocStrFormatted>> tooltipFactory = default, ); + public Mafi.Localization.LocStrFormatted GetTooltip(); + public bool HasOptionValue(Mafi.Core.Game.GameDifficultyConfig config); - public Mafi.Localization.LocStrFormatted Title { get; } + public Mafi.Localization.LocStr Title { get; } }
EnumSettingInfo<T> class changed public class EnumSettingInfo<T> { public EnumSettingInfo( string valueMemberName, - Mafi.Localization.LocStrFormatted title, + Mafi.Localization.LocStr title, - Mafi.Localization.LocStrFormatted tooltip, + Mafi.Localization.LocStr tooltip, - Mafi.Localization.LocStrFormatted[] labels, + Mafi.Localization.LocStr[] labels, + Mafi.Option<System.Func<Mafi.Localization.LocStrFormatted>> tooltipFactory = default, ); }
GameMechanicApplier class changed public class GameMechanicApplier { public GameMechanicApplier( - Mafi.Localization.LocStrFormatted title, + Mafi.Localization.LocStr title, - Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Localization.LocStrFormatted> items, + Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Localization.LocStr> items, System.Action<Mafi.Core.Game.GameDifficultyConfig> apply, Mafi.Core.Game.GameDifficultyPreset[] recommendedFor = null, string iconPath = null, ); - public Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Localization.LocStrFormatted> Items { get; } + public Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Localization.LocStr> Items { get; } - public Mafi.Localization.LocStrFormatted Title { get; } + public Mafi.Localization.LocStr Title { get; } }
IDiffSettingInfo interface changed public interface IDiffSettingInfo { + bool HasOptionValue(Mafi.Core.Game.GameDifficultyConfig config); - Mafi.Localization.LocStrFormatted Title { get; } + Mafi.Localization.LocStr Title { get; } }
PercentSettingInfo class changed public class PercentSettingInfo { public PercentSettingInfo( string valueMemberName, - Mafi.Localization.LocStrFormatted title, + Mafi.Localization.LocStr title, - Mafi.Localization.LocStrFormatted tooltip, + Mafi.Localization.LocStr tooltip, Mafi.Percent[] options, bool negativeIsBetter, ); }
}
namespace Mafi.Core.Hub {
HubClient class changed public class HubClient { + public HubClient(string toolProduct); + public void ResolveModCompatibility(Mafi.Collections.ReadonlyCollections.IIndexable<System.Collections.Generic.KeyValuePair<string, Mafi.VersionSlim>> installedMods, string gameVersion, System.Action<Mafi.Core.Hub.ApiResult<Mafi.Core.Hub.Dtos.ModCompatibilityDto[]>> onDone); }
}
namespace Mafi.Core.Input {
CheatCommandAttribute class added + public sealed class CheatCommandAttribute : System.Attribute { + public CheatCommandAttribute(); + public static bool IsDefinedOn(System.Type commandType); + }
TerraformerDepositCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class TerraformerDepositCmd { }
TerraformerRemoveCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class TerraformerRemoveCmd { }
}
namespace Mafi.Core.Maintenance {
EntityMaintenanceProvider class changed public class EntityMaintenanceProvider { + public Mafi.Fix64 AvgMaintenancePerMonthForOverlays { get; } }
IEntityMaintenanceProvider interface changed public interface IEntityMaintenanceProvider { + Mafi.Fix64 AvgMaintenancePerMonthForOverlays { get; } }
IMaintenanceProducingEntity interface added + public interface IMaintenanceProducingEntity : Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IObjectWithTitle, Mafi.Serialization.IIsSafeAsHashKey { + Mafi.PartialQuantity GetCurrentMaintenanceProductionPerMonth(); + }
MaintenanceDepot class changed public class MaintenanceDepot { + : Mafi.Core.Maintenance.IMaintenanceProducingEntity + public Mafi.PartialQuantity GetCurrentMaintenanceProductionPerMonth(); }
MaintenanceManager class changed + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_unlockedProtosDb", 342, typeof(Mafi.Core.Prototypes.UnlockedProtosDb))] public class MaintenanceManager { public MaintenanceManager( Mafi.Core.Maintenance.IMaintenanceConfig config, Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.PropertiesDb.IPropertiesDb propertiesDb, Mafi.Core.Prototypes.ProtosDb protos, Mafi.Core.Products.ProductsManager productsManager, - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.Population.IUpointsManager upointsManager, Mafi.Core.Notifications.INotificationsManager notificationsManager, Mafi.Core.Entities.Static.IConstructionManager constructionManager, Mafi.Core.RandomProvider randomProvider, Mafi.Core.Stats.StatsManager statsManager, Mafi.Core.Game.GameDifficultyConfig gameDifficultyConfig, ); - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> GetBuffer( + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> GetBuffer( Mafi.Core.Products.ProductProto product, Mafi.Option<Mafi.Core.Entities.IEntity> entity, ); }
NoMaintenanceProvider class changed public class NoMaintenanceProvider { + public Mafi.Fix64 AvgMaintenancePerMonthForOverlays { get; } }
}
namespace Mafi.Core.Map {
UnlockMapCellCmd class changed + [System.ObsoleteAttribute("Has no processor, map cells are not unlocked by commands")] public class UnlockMapCellCmd { }
}
namespace Mafi.Core.Mods {
ModManifest class changed public class ModManifest { + public static bool IsObsoleteId(string id); }
ProtoRegistrator class changed public class ProtoRegistrator { + public void AddPreLockAction(System.Action<Mafi.Core.Mods.ProtoRegistrator> action); + public void RegisterDataWithInterface<TData>(System.Reflection.Assembly assembly) where TData : class, Mafi.Core.Mods.IModData; }
PublishedDlcRecord class changed public class PublishedDlcRecord { - public readonly Mafi.Localization.LocStrFormatted Description; + public readonly Mafi.Localization.LocStr Description; - public readonly Mafi.Localization.LocStrFormatted Name; + public readonly Mafi.Localization.LocStr Name; public PublishedDlcRecord( string id, - Mafi.Localization.LocStrFormatted name, + Mafi.Localization.LocStr name, - Mafi.Localization.LocStrFormatted description, + Mafi.Localization.LocStr description, uint steamAppId, string thumbnailPrefabPath, string projectName, ); }
}
namespace Mafi.Core.Population {
IEntityProvidingHousing interface added + public interface IEntityProvidingHousing : Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IObjectWithTitle, Mafi.Serialization.IIsSafeAsHashKey { + int Population { get; } + }
}
namespace Mafi.Core.Ports.Io {
IoPortData struct changed public readonly struct IoPortData { - [Mafi.PureAttribute] public Mafi.Quantity SendAsMuchAsFromBuffer(Mafi.Core.Entities.Static.IProductBuffer buffer); }
}
namespace Mafi.Core.Products {
CompressionParam class added + public sealed class CompressionParam : Mafi.Core.Prototypes.IProtoParam { + public readonly bool HasPressingRecipe; + public readonly bool HasUnpressingRecipe; + public readonly int Ratio; + public CompressionParam(int ratio, System.Func<Mafi.Core.Products.ProductProto.ID> compressesTo, bool hasPressingRecipe = true, bool hasUnpressingRecipe = true); + public System.Type AllowedProtoType { get; } + public Mafi.Core.Products.ProductProto.ID CompressesTo { get; } + }
EntityProductFlowTracker class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + [Mafi.Serialization.GenerateSerializer] + public sealed class EntityProductFlowTracker { + public EntityProductFlowTracker(Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents); + public static Mafi.Core.Products.EntityProductFlowTracker Deserialize(Mafi.Serialization.BlobReader reader); + public void GetAllAvgPerMonthForOverlays(Mafi.Core.Products.ProductProto product, bool isOutput, Mafi.Collections.Lyst<System.Collections.Generic.KeyValuePair<Mafi.Core.Entities.IEntity, Mafi.Fix64>> outAmounts); + public Mafi.Fix64 GetAvgPerMonthForOverlays(Mafi.Core.Entities.IEntity entity, Mafi.Core.Products.ProductProto product, bool isOutput); + public static void Serialize(Mafi.Core.Products.EntityProductFlowTracker value, Mafi.Serialization.BlobWriter writer); + }
IProductsManager interface changed public interface IProductsManager { + void DestroyProductReturnRemovedSourceProducts(Mafi.Core.Entities.IEntity sink, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, Mafi.Core.Products.DestroyReason reason, Mafi.Collections.Lyst<System.Collections.Generic.KeyValuePair<Mafi.Core.Products.ProductProto, Mafi.PartialQuantityLarge>> result); + void ProductCreated(Mafi.Core.Entities.IEntity source, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, Mafi.Core.Products.CreateReason reason); + void ProductDestroyed(Mafi.Core.Entities.IEntity sink, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, Mafi.Core.Products.DestroyReason reason); void ReportProductsTransformation( - Mafi.Option<Mafi.Core.Prototypes.Proto> source, + Mafi.Core.Entities.IEntity source, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> inputs, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> outputs, Mafi.Core.Products.DestroyReason destroyReason, Mafi.Core.Products.CreateReason createReason, - bool disableSourceProductsConversionLoss = false, ); + void ReportProductsTransformation(Mafi.Option<Mafi.Core.Prototypes.Proto> source, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> inputs, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> outputs, Mafi.Core.Products.DestroyReason destroyReason, Mafi.Core.Products.CreateReason createReason); void ReportRecipeTransformation( + Mafi.Core.Entities.IEntity machine, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> inputs, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> outputs, Mafi.Core.Products.DestroyReason destroyReason, Mafi.Core.Products.CreateReason createReason, Mafi.Core.Stats.QuantitySumStats bindingStats, int mult, - bool disableSourceProductsConversionLoss = false, ); + Mafi.Percent RecyclingRatio { get; } }
IProductsManagerExtensions class changed public static class IProductsManagerExtensions { public static void ClearBufferAndReportProducts( this Mafi.Core.Products.IProductsManager mgr, Mafi.Option<Mafi.Core.Prototypes.Proto> sink, - Mafi.Core.Entities.Static.ProductBuffer buffer, + Mafi.Core.Entities.Static.IProductBuffer buffer, Mafi.Core.Products.DestroyReason reason, ); + public static void ProductCreated(this Mafi.Core.Products.IProductsManager mgr, Mafi.Core.Entities.IEntity source, Mafi.Core.ProductQuantity productQuantity, Mafi.Core.Products.CreateReason reason); + public static void ProductDestroyed(this Mafi.Core.Products.IProductsManager mgr, Mafi.Core.Entities.IEntity sink, Mafi.Core.ProductQuantity productQuantity, Mafi.Core.Products.DestroyReason reason); + public static void ReportProductsTransformation(this Mafi.Core.Products.IProductsManager mgr, Mafi.Core.Entities.IEntity source, Mafi.Core.ProductQuantity input, Mafi.Core.ProductQuantity output, Mafi.Core.Products.DestroyReason destroyReason, Mafi.Core.Products.CreateReason createReason); }
MixedMaterialCategory class added + public sealed class MixedMaterialCategory { + public readonly Mafi.Option<Mafi.Core.Products.MixedMaterialCategory> CompactedFromCategory; + public readonly int CompactionRatio; + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Products.ProductProto> MemberProducts; + public readonly bool MembersCarryStats; + public readonly Mafi.Core.Products.ProductProto PlaceholderProduct; + public readonly bool ShowMemberTextureOnBelts; + public static Mafi.Core.Products.MixedMaterialCategory CreateAndRegister(Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Core.Products.ProductProto placeholderProduct, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Products.ProductProto> memberProducts, bool showMemberTextureOnBelts = false, bool membersCarryStats = false, bool destroyOnQuickRemove = false); + public static Mafi.Core.Products.MixedMaterialCategory CreateCompactedAndRegister(Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Core.Products.ProductProto placeholderProduct, Mafi.Core.Products.MixedMaterialCategory sourceCategory, bool destroyOnQuickRemove = false); + public Mafi.Core.Products.ProductProto GetCompactedMember(Mafi.Core.Products.ProductProto sourceMember); + public byte GetMemberIndex(Mafi.Core.Products.ProductProto member); + public Mafi.Core.Products.MixedMemberProductProto GetMixedMember(Mafi.Core.Products.ProductProto member); + public bool IsMember(Mafi.Core.Products.ProductProto product); + public bool IsMember(Mafi.Core.Products.ProductSlimId slimId); + public Mafi.Option<Mafi.Core.Products.ProductProto> TryGetMemberByIndex(byte memberIndex); + public bool TryGetMemberIndex(Mafi.Core.Products.ProductProto member, out byte memberIndex); + public bool TryGetMixedMember(Mafi.Core.Products.ProductProto member, out Mafi.Core.Products.MixedMemberProductProto mixedMember); + public bool TryGetMixedMemberByIndex(byte memberIndex, out Mafi.Core.Products.MixedMemberProductProto mixedMember); + public bool TryGetSourceMember(Mafi.Core.Products.ProductProto member, out Mafi.Core.Products.ProductProto sourceMember); + public Mafi.Option<Mafi.Core.Products.MixedMaterialCategory> CompactedIntoCategory { get; } + }
MixedMaterialCategoryManager class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + [Mafi.Serialization.GenerateSerializer] + public sealed class MixedMaterialCategoryManager { + public MixedMaterialCategoryManager(Mafi.Core.Prototypes.ProtosDb protosDb); + public static Mafi.Core.Products.MixedMaterialCategoryManager Deserialize(Mafi.Serialization.BlobReader reader); + public static void Serialize(Mafi.Core.Products.MixedMaterialCategoryManager value, Mafi.Serialization.BlobWriter writer); + public Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.Products.MixedMaterialCategory> AllCategories { get; } + }
MixedMemberProductProto class added + public sealed class MixedMemberProductProto : Mafi.Core.Products.ProductProto { + public readonly Mafi.Core.Products.MixedMaterialCategory Category; + public readonly Mafi.Core.Products.ProductProto Member; + new public static readonly Mafi.Core.Products.MixedMemberProductProto Phantom; + }
MixedReceiveExtensions class added + public static class MixedReceiveExtensions { + public static bool CanStoreAsMixedMember(this Mafi.Core.Products.ProductProto bufferProduct, Mafi.Core.Products.ProductProto product); + public static bool DestroyReceivedProductIfInvalid(this Mafi.Core.Ports.IEntityWithPorts receiver, Mafi.Core.ProductQuantity pq); + }
ProductProto class changed public class ProductProto { + public bool DestroyOnQuickRemove { get; } - public bool IsMixable { get; } + public bool IsRadioactive { get; } + public Mafi.Option<Mafi.Core.Products.MixedMaterialCategory> MixedCategory { get; } + public Mafi.Option<Mafi.Core.Products.ProductProto> MixedMember { get; } + public Mafi.Core.Products.ProductProto MixedMemberOrSelf { get; } + public Mafi.Core.Products.ProductProto PlaceholderOrSelf { get; } + public Mafi.Core.Products.ProductProto StatsProduct { get; } }
ProductsManager class changed public sealed class ProductsManager { public ProductsManager( Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.Products.ProductsSlimIdManager productsSlimIdManager, Mafi.Core.PropertiesDb.PropsDb propsDb, Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Stats.StatsManager statsManager, Mafi.LazyResolve<Mafi.Core.Economy.IAssetTransactionManager> assetsManager, + Mafi.Core.Products.EntityProductFlowTracker flowTracker, ); + public void DestroyProductReturnRemovedSourceProducts(Mafi.Core.Entities.IEntity sink, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, Mafi.Core.Products.DestroyReason reason, Mafi.Collections.Lyst<System.Collections.Generic.KeyValuePair<Mafi.Core.Products.ProductProto, Mafi.PartialQuantityLarge>> result); + public void ProductCreated(Mafi.Core.Entities.IEntity source, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, Mafi.Core.Products.CreateReason reason); + public void ProductDestroyed(Mafi.Core.Entities.IEntity sink, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, Mafi.Core.Products.DestroyReason reason); public void ReportProductsTransformation( - Mafi.Option<Mafi.Core.Prototypes.Proto> source, + Mafi.Core.Entities.IEntity source, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> inputs, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> outputs, Mafi.Core.Products.DestroyReason destroyReason, Mafi.Core.Products.CreateReason createReason, - bool disableSourceProductsConversionLoss = false, ); + public void ReportProductsTransformation(Mafi.Option<Mafi.Core.Prototypes.Proto> source, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> inputs, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> outputs, Mafi.Core.Products.DestroyReason destroyReason, Mafi.Core.Products.CreateReason createReason); public void ReportRecipeTransformation( + Mafi.Core.Entities.IEntity machine, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> inputs, Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Core.ProductQuantity> outputs, Mafi.Core.Products.DestroyReason destroyReason, Mafi.Core.Products.CreateReason createReason, Mafi.Core.Stats.QuantitySumStats bindingStats, int mult, - bool disableSourceProductsConversionLoss = false, ); }
ProductsSlimIdManager class changed public sealed class ProductsSlimIdManager { public ProductsSlimIdManager( Mafi.Core.Prototypes.ProtosDb db, + Mafi.Core.Products.MixedMaterialCategoryManager mixedCategories, ); }
RecyclablesAccumulator class added + [Mafi.Serialization.GenerateSerializer] + public sealed class RecyclablesAccumulator { + public const int SCRAP_PER_RECYCLABLE = 2; + public RecyclablesAccumulator(Mafi.Core.Products.MixedMaterialCategory category, Mafi.Core.Products.IProductsManager productsManager); + public void Clear(); + public static Mafi.Core.Products.RecyclablesAccumulator Deserialize(Mafi.Serialization.BlobReader reader); + public static Mafi.Fix64 EstimateRecyclablesFor(Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Products.ProductProto input, Mafi.Quantity consumedQuantity); + public static Mafi.Fix64 EstimateRecyclablesForRecipe(Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Factory.Recipes.IRecipeForUi recipe); + public Mafi.Quantity SendWholeAccumulatedUnits(Mafi.Core.Entities.IEntity owner, Mafi.Core.Entities.Static.IMixedProductBuffer outputBuffer, Mafi.Core.Products.CreateReason createReason, out Mafi.Quantity wholeUnitsKeptAccumulated, bool keepUnstoredAccumulated = false); + public Mafi.Quantity SendWholeAccumulatedUnits(Mafi.Option<Mafi.Core.Prototypes.Proto> owner, Mafi.Core.Entities.Static.IMixedProductBuffer outputBuffer, Mafi.Core.Products.CreateReason createReason, out Mafi.Quantity wholeUnitsKeptAccumulated, bool keepUnstoredAccumulated = false); + public static void Serialize(Mafi.Core.Products.RecyclablesAccumulator value, Mafi.Serialization.BlobWriter writer); + public void StoreAsRecyclablesAndDestroy(Mafi.Core.Entities.IEntity owner, Mafi.Core.ProductQuantity input, Mafi.Core.Products.DestroyReason destroyReason); + public void StoreAsRecyclablesAndDestroy(Mafi.Option<Mafi.Core.Prototypes.Proto> owner, Mafi.Core.ProductQuantity input, Mafi.Core.Products.DestroyReason destroyReason); + public Mafi.Core.Products.MixedMaterialCategory Category { get; } + public bool IsEmpty { get; } + }
TerrainMaterialProto class changed public class TerrainMaterialProto { + public readonly bool UseSoftCollapseSound; + [System.ObsoleteAttribute("Use the constructor with useSoftCollapseSound.")] public TerrainMaterialProto( Mafi.Core.Prototypes.Proto.ID id, string nameInEditor, Mafi.Core.Products.LooseProductProto minedProduct, Mafi.Percent minedQuantityMult, Mafi.ThicknessTilesF minCollapseHeightDiff, Mafi.ThicknessTilesF maxCollapseHeightDiff, Mafi.Core.Products.TerrainMaterialProto.Gfx graphics, - bool isFarmable = false, + bool isFarmable, - bool canBeConvertedToForestFloor = false, + bool canBeConvertedToForestFloor, - bool isForestFloor = false, + bool isForestFloor, - bool ignoreInEditor = false, + bool ignoreInEditor, - bool canSpreadToNearbyMaterials = false, + bool canSpreadToNearbyMaterials, - Mafi.Core.Prototypes.Proto.ID? weathersInto = null, + Mafi.Core.Prototypes.Proto.ID? weathersInto, - Mafi.Core.Prototypes.Proto.ID? disruptsInto = null, + Mafi.Core.Prototypes.Proto.ID? disruptsInto, - Mafi.Percent? disruptionSpeedMult = null, + Mafi.Percent? disruptionSpeedMult, - bool disruptWhenCollapsing = false, + bool disruptWhenCollapsing, - Mafi.Core.Prototypes.Proto.ID? recoversInto = null, + Mafi.Core.Prototypes.Proto.ID? recoversInto, - bool recoversUnderWater = false, + bool recoversUnderWater, - Mafi.Duration recoveryTime = default, + Mafi.Duration recoveryTime, - Mafi.Percent grassGrowthOnTop = default, + Mafi.Percent grassGrowthOnTop, - int asteroidSpawnWeight = 0, + int asteroidSpawnWeight, - bool isAsteroidFillerMaterial = false, + bool isAsteroidFillerMaterial, ); + public TerrainMaterialProto(Mafi.Core.Prototypes.Proto.ID id, string nameInEditor, Mafi.Core.Products.LooseProductProto minedProduct, Mafi.Percent minedQuantityMult, Mafi.ThicknessTilesF minCollapseHeightDiff, Mafi.ThicknessTilesF maxCollapseHeightDiff, Mafi.Core.Products.TerrainMaterialProto.Gfx graphics, bool isFarmable = false, bool canBeConvertedToForestFloor = false, bool isForestFloor = false, bool ignoreInEditor = false, bool canSpreadToNearbyMaterials = false, Mafi.Core.Prototypes.Proto.ID? weathersInto = null, Mafi.Core.Prototypes.Proto.ID? disruptsInto = null, Mafi.Percent? disruptionSpeedMult = null, bool disruptWhenCollapsing = false, Mafi.Core.Prototypes.Proto.ID? recoversInto = null, bool recoversUnderWater = false, Mafi.Duration recoveryTime = default, Mafi.Percent grassGrowthOnTop = default, int asteroidSpawnWeight = 0, bool isAsteroidFillerMaterial = false, bool useSoftCollapseSound = false); }
}
namespace Mafi.Core.Prototypes {
IProtoWithOwnedProtos interface added + public interface IProtoWithOwnedProtos : Mafi.Core.Prototypes.IProto { + void GetOwnedProtos(Mafi.Collections.Lyst<Mafi.Core.Prototypes.IProto> ownedProtos); + }
IProtoWithRestrictedUnlock interface added + public interface IProtoWithRestrictedUnlock : Mafi.Core.Prototypes.IProto { + }
Proto class changed public abstract class Proto { + public static string AsDerivedIdPart(string id); }
ProtoExtensions class changed public static class ProtoExtensions { + public static bool TryCheckUnlocked(this Mafi.Core.Prototypes.IProto proto, out string error); }
ProtosDb class changed public class ProtosDb { + public void AddPreLockAction(System.Action<Mafi.Core.Prototypes.ProtosDb> action); + public bool TryGetUnlockedProto<T>(Mafi.Core.Prototypes.Proto.ID id, out T proto, out string error) where T : Mafi.Core.Prototypes.IProto; }
UnlockedProtosDb class changed public class UnlockedProtosDb { + public event System.Action OnRestrictedUnlocksChanged; }
}
namespace Mafi.Core.Research {
ResearchCheatFinishCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class ResearchCheatFinishCmd { }
}
namespace Mafi.Core.SaveGame {
GameSaveInfo class changed public class GameSaveInfo { public GameSaveInfo( Mafi.GameDate gameDate, string mapName, int population, int researchNodesUnlocked, int researchNodesTotal, int launchCount, string notes, Mafi.Vector2i thumbnailImageSize, byte[] thumbnailImageBytes, bool isSandbox, - string gameVersion = "0.8.7d", + string gameVersion = "0.8.8", bool isDemo = false, int? rfDebugFlag = null, ); }
}
namespace Mafi.Core.SpaceProgram {
RocketEntity class changed public class RocketEntity { - public Mafi.Core.Entities.SoundParams? SoundParams { get; } }
RocketProto class changed public class RocketProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string SoundPrefabPath; - public Gfx(string prefabPath, string soundPrefabPath); + public Gfx(string prefabPath, string soundPrefabPath = null); } }
SpaceStation class changed public class SpaceStation { - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> CrewSuppliesBuffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> CrewSuppliesBuffer { get; } - public Mafi.Core.Entities.Static.IProductBuffer MaintenancePartsBuffer { get; } + public Mafi.Core.Entities.Static.IPlainProductBuffer MaintenancePartsBuffer { get; } - public Mafi.Option<Mafi.Core.Entities.Static.IProductBuffer> ResearchSuppliesBuffer { get; } + public Mafi.Option<Mafi.Core.Entities.Static.IPlainProductBuffer> ResearchSuppliesBuffer { get; } }
}
namespace Mafi.Core.Stats {
FuelStatsCollector class changed public class FuelStatsCollector { + public void ReportFuelUseAndDestroy(Mafi.Core.Entities.IEntity consumer, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, Mafi.Core.Stats.FuelUsedBy reason); }
IFuelStatsCollector interface changed public interface IFuelStatsCollector { + void ReportFuelUseAndDestroy(Mafi.Core.Entities.IEntity consumer, Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity, Mafi.Core.Stats.FuelUsedBy reason); }
}
namespace Mafi.Core.Terrain {
CheatRestoreTerrainCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class CheatRestoreTerrainCmd { }
VirtualResourceManager class changed public class VirtualResourceManager { - public void AddAvailableTileResourcesToLyst(Mafi.Tile2i position, Mafi.Collections.Lyst<Mafi.Core.Terrain.Resources.ProductVirtualResource> resources); }
}
namespace Mafi.Core.Terrain.Designation {
QuickFulfillDesignationsCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class QuickFulfillDesignationsCmd { }
}
namespace Mafi.Core.Terrain.Physics {
ITerrainDisruptionSimulator interface changed public interface ITerrainDisruptionSimulator { + bool TryGetMaterialToRecover(Mafi.Tile2iIndex index, out Mafi.Core.Products.TerrainMaterialSlimId material); }
ITerrainPhysicsSimulator interface changed public interface ITerrainPhysicsSimulator { + Mafi.IEventNonSaveable<Mafi.Collections.ReadonlyCollections.ReadOnlyArraySlice<Mafi.Core.Terrain.Physics.TerrainCollapse>> Collapsed { get; } }
NoTerrainDisruptionSimulator class changed public sealed class NoTerrainDisruptionSimulator { + public bool TryGetMaterialToRecover(Mafi.Tile2iIndex index, out Mafi.Core.Products.TerrainMaterialSlimId material); }
NoTerrainPhysicsSimulator class changed public sealed class NoTerrainPhysicsSimulator { + public Mafi.IEventNonSaveable<Mafi.Collections.ReadonlyCollections.ReadOnlyArraySlice<Mafi.Core.Terrain.Physics.TerrainCollapse>> Collapsed { get; } }
TerrainCollapse struct added + public readonly struct TerrainCollapse { + public readonly Mafi.Tile2iAndIndex Destination; + public readonly int MaterialSlimIdRaw; + public TerrainCollapse(Mafi.Tile2iAndIndex destination, int materialSlimIdRaw); + }
}
namespace Mafi.Core.Terrain.Trees {
ITreeHarvestingManager interface changed public interface ITreeHarvestingManager { Mafi.Core.ProductQuantity HarvestTree( Mafi.Core.Terrain.Trees.TreeId tree, - Mafi.Option<Mafi.Core.Prototypes.Proto> woodSource = default, + Mafi.Option<Mafi.Core.Entities.IEntity> harvester = default, ); }
ITreesManager interface changed public interface ITreesManager { + int GetTreeCountInChunk(Mafi.Chunk2i chunk); }
TreesManager class changed public class TreesManager { + public int GetTreeCountInChunk(Mafi.Chunk2i chunk); public Mafi.Core.ProductQuantity HarvestTree( Mafi.Core.Terrain.Trees.TreeId id, - Mafi.Option<Mafi.Core.Prototypes.Proto> woodSource = default, + Mafi.Option<Mafi.Core.Entities.IEntity> harvester = default, ); }
}
namespace Mafi.Core.Trains {
CargoWagon class changed public class CargoWagon { + : Mafi.Core.Entities.IEntityWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; public class SubCargoWagon { public SubCargoWagon( Mafi.Core.Trains.CargoWagon parent, int subCarIndex, - Mafi.Core.ProductQuantity cargo, Mafi.Option<Mafi.Core.Products.ProductProto> onlyAllowedProduct, ); - public Mafi.Quantity ReceiveAsMuchAs(Mafi.Core.ProductQuantity pq); - public void RemoveCargo(Mafi.Core.ProductQuantity pq); + public Mafi.Option<Mafi.Core.Entities.Static.IMixedProductBuffer> CargoBuffer { get; } } }
CargoWagonLooseProto class changed public class CargoWagonLooseProto { public CargoWagonLooseProto( Mafi.Core.Entities.Dynamic.DynamicEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Quantity capacity, Mafi.Core.Products.ProductType productType, Mafi.RelTile1i carLength, Mafi.RelTile1f bogiePivotsOffset, Mafi.RelTile1f bogieWheelBase, Mafi.Fix32 massTonsWhenEmpty, Mafi.Fix32 massTonsWhenFull, Mafi.Fix32 brakingForceKn, Mafi.Fix32 rollingResistanceCoefficientTimesThousand, Mafi.Fix32 frontalAreaM2, Mafi.Fix32 lengthDragAsExtraFrontalArea, Mafi.Fix32 dragCoefficientStandalone, Mafi.Fix32 dragCoefficientInline, Mafi.Duration durationToBuild, Mafi.Core.Trains.CargoWagonLooseProto.Gfx graphics, Mafi.RelTile1f maxSpeed = default, int subCarCount = 1, - Mafi.Core.Trains.TrainCarSoundSpecs soundSpecs = default, ); new public class Gfx { public Gfx( string prefabPath, float carWidthMeters, float carHeightMeters, float wheelRadiusMeters, Mafi.Core.Trains.TrainColor defaultColor, float orderInBuildMenu, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Trains.CargoWagonLooseProto.Gfx.WagonPileData> pilesData, string customSideViewIconPath = "", string frontBogieModelName = "", string rearBogieModelName = "", string frontCouplerName = "FrontCoupler", string rearCouplerName = "RearCoupler", string frontCarConnectorName = "", string rearCarConnectorName = "", float frontCarConnectorSize = 0, float rearCarConnectorSize = 0, string wheelModelPrefix = "wheel", Mafi.Option<Mafi.Core.Entities.Dynamic.VehicleExhaustParticlesSpec> exhaustParticlesSpec = default, - Mafi.Core.Trains.TrainCarSoundSpecs soundSpecs = default, ); } }
CargoWagonMolten class changed public class CargoWagonMolten { public class SubCargoWagonMolten { public SubCargoWagonMolten( Mafi.Core.Trains.CargoWagonMolten parent, int subCarIndex, - Mafi.Core.ProductQuantity cargo, Mafi.Option<Mafi.Core.Products.ProductProto> onlyAllowedProduct, ); } }
CargoWagonMoltenProto class changed public class CargoWagonMoltenProto { new public class Gfx { public Gfx( string prefabPath, float carWidthMeters, float carHeightMeters, float wheelRadiusMeters, Mafi.Core.Trains.TrainColor defaultColor, float orderInBuildMenu, string ladleObjectPrefix, bool hasMoltenSurfaceAnimation, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.ParticlesParams> particlesParamsForUnloadingLeft, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.ParticlesParams> particlesParamsForUnloadingRight, string customSideViewIconPath = "", string frontBogieModelName = "", string rearBogieModelName = "", string frontCouplerName = "FrontCoupler", string rearCouplerName = "RearCoupler", string frontCarConnectorName = "", string rearCarConnectorName = "", float frontCarConnectorSize = 0, float rearCarConnectorSize = 0, string wheelModelPrefix = "wheel", Mafi.Option<Mafi.Core.Entities.Dynamic.VehicleExhaustParticlesSpec> exhaustParticlesSpec = default, - Mafi.Core.Trains.TrainCarSoundSpecs soundSpecs = default, ); } }
CargoWagonProto class changed public class CargoWagonProto { - public bool AcceptsProduct(Mafi.Core.Products.ProductProto p); + public bool AcceptsProduct(Mafi.Core.Products.ProductProto product); + public static bool CanHold(Mafi.Core.Products.ProductType holderType, bool isRadiationShielded, Mafi.Core.Products.ProductProto product); + public bool CanPairWith(Mafi.Core.Trains.ITrainStationModule module); + public bool IsSameKindAs(Mafi.Core.Trains.CargoWagonProto other); + public static bool MatchesTypeAndShielding(Mafi.Core.Products.ProductType holderType, bool isRadiationShielded, Mafi.Core.Products.ProductProto product); + public virtual bool IsRadiationShielded { get; } }
CargoWagonShielded class added + [Mafi.Serialization.GenerateSerializer] + public class CargoWagonShielded : Mafi.Core.Trains.CargoWagonUnit, Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IEntityWithProducts, Mafi.Core.Entities.IObjectWithTitle, Mafi.Core.Environment.IShieldedEntity, Mafi.Serialization.IIsSafeAsHashKey { + public CargoWagonShielded(Mafi.Core.EntityId id, Mafi.Core.Trains.CargoWagonShieldedProto prototype, Mafi.Core.Entities.EntityContext context, Mafi.Core.Maintenance.IEntityMaintenanceProvidersFactory maintenanceProvidersFactory); + new public static Mafi.Core.Trains.CargoWagonShielded Deserialize(Mafi.Serialization.BlobReader reader); + void Mafi.Core.Environment.IShieldedEntity.ForEachShieldedProduct<TConsumer>(TConsumer consumer); + public static void Serialize(Mafi.Core.Trains.CargoWagonShielded value, Mafi.Serialization.BlobWriter writer); + bool Mafi.Core.Environment.IShieldedEntity.HasShielding { get; } + }
CargoWagonShieldedProto class added + public class CargoWagonShieldedProto : Mafi.Core.Trains.CargoWagonUnitProto { + public CargoWagonShieldedProto(Mafi.Core.Entities.Dynamic.DynamicEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Quantity capacity, Mafi.RelTile1i carLength, Mafi.RelTile1f bogiePivotsOffset, Mafi.RelTile1f bogieWheelBase, Mafi.Fix32 massTonsWhenEmpty, Mafi.Fix32 massTonsWhenFull, Mafi.Fix32 brakingForceKn, Mafi.Fix32 rollingResistanceCoefficientTimesThousand, Mafi.Fix32 frontalAreaM2, Mafi.Fix32 lengthDragAsExtraFrontalArea, Mafi.Fix32 dragCoefficientStandalone, Mafi.Fix32 dragCoefficientInline, Mafi.Duration durationToBuild, Mafi.Core.Trains.CargoWagonUnitProto.Gfx graphics); + }
CargoWagonUnitProto class changed public class CargoWagonUnitProto { new public class Gfx { public Gfx( string prefabPath, float carWidthMeters, float carHeightMeters, float wheelRadiusMeters, Mafi.Core.Trains.TrainColor defaultColor, float orderInBuildMenu, string customSideViewIconPath = "", string frontBogieModelName = "", string rearBogieModelName = "", string frontCouplerName = "FrontCoupler", string rearCouplerName = "RearCoupler", string frontCarConnectorName = "", string rearCarConnectorName = "", float frontCarConnectorSize = 0, float rearCarConnectorSize = 0, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Trains.CargoWagonUnitProto.Gfx.WagonProductsData>? productsData = null, string wheelModelPrefix = "wheel", Mafi.Option<Mafi.Core.Entities.Dynamic.VehicleExhaustParticlesSpec> exhaustParticlesSpec = default, - Mafi.Core.Trains.TrainCarSoundSpecs soundSpecs = default, ); } }
CreateTrainTrackEntityWithDirectionCmd class changed public class CreateTrainTrackEntityWithDirectionCmd { + public CreateTrainTrackEntityWithDirectionCmd(Mafi.Core.Entities.Static.StaticEntityProto.ID protoId, Mafi.Core.TileTransform transform, Mafi.Core.Trains.TrainTrackTrajectoryDirection direction); + [System.ObsoleteAttribute("isFree is ignored")] public CreateTrainTrackEntityWithDirectionCmd( Mafi.Core.Entities.Static.StaticEntityProto.ID protoId, Mafi.Core.TileTransform transform, Mafi.Core.Trains.TrainTrackTrajectoryDirection direction, - bool isFree = false, + bool isFree, ); }
DestroyTrainImmediateCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class DestroyTrainImmediateCmd { }
EntityWithTrainTrackBaseProto class changed public abstract class EntityWithTrainTrackBaseProto { + public virtual bool BlocksTrainTraffic { get; } }
IEntityWithTrainTrack interface changed public interface IEntityWithTrainTrack { + void TakeOverConstructionProducts(Mafi.Core.Economy.AssetValue products); }
IEntityWithTrainTrackBaseProto interface changed public interface IEntityWithTrainTrackBaseProto { + bool BlocksTrainTraffic { get; } }
IEntityWithTrainTrackExtensions class changed public static class IEntityWithTrainTrackExtensions { + public static void CarryOrFillConstructionProducts(this Mafi.Core.Trains.IEntityWithTrainTrack entity, ref Mafi.Core.Economy.AssetValue? carried, Mafi.Core.Economy.AssetValue products); + public static void DrainCarriedProducts(this Mafi.Core.Trains.IEntityWithTrainTrack entity, ref Mafi.Core.Economy.AssetValue? carried, Mafi.Core.Entities.Static.ConstructionState state); + public static void FillConstructionOrRefund(this Mafi.Core.Trains.IEntityWithTrainTrack entity, Mafi.Core.Economy.AssetValue products); + public static Mafi.Core.Economy.AssetValue TakeProductsBeforeRemoval(this Mafi.Core.Trains.IEntityWithTrainTrack entity); }
ITrainFriend interface changed public interface ITrainFriend { + void SimUpdateNotSpawned(); }
ITrainStationModule interface changed public interface ITrainStationModule { + Mafi.Percent ConnectionPercent { get; } + bool IsRadiationShielded { get; } }
ITrainTrackBuffer interface added + public interface ITrainTrackBuffer : Mafi.Core.Entities.IAreaSelectableEntity, Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IEntityWithPosition, Mafi.Core.Entities.IEntityWithReplaceVerification, Mafi.Core.Entities.IObjectWithTitle, Mafi.Core.Entities.IRenderedEntity, Mafi.Core.Entities.IUpgradableEntity, Mafi.Core.Entities.IUpgradableEntityWithCustomUi, Mafi.Core.Entities.Static.ILayoutEntity, Mafi.Core.Entities.Static.IStaticEntity, Mafi.Core.Trains.IEntityWithTrainTrack, Mafi.Core.Trains.ITrainTrackManagedEntity, Mafi.Core.Trains.ITrainTracksGraphPiece, Mafi.Serialization.IIsSafeAsHashKey { + void SetAllowsTurnaround(bool allowsTurnaround); + bool AllowsTurnaround { get; } + }
ITrainTrackBufferFriend interface added + public interface ITrainTrackBufferFriend : Mafi.Core.Entities.IAreaSelectableEntity, Mafi.Core.Entities.IEntity, Mafi.Core.Entities.IEntityWithPosition, Mafi.Core.Entities.IEntityWithReplaceVerification, Mafi.Core.Entities.IObjectWithTitle, Mafi.Core.Entities.IRenderedEntity, Mafi.Core.Entities.IUpgradableEntity, Mafi.Core.Entities.IUpgradableEntityWithCustomUi, Mafi.Core.Entities.Static.ILayoutEntity, Mafi.Core.Entities.Static.IStaticEntity, Mafi.Core.Trains.IEntityWithTrainTrack, Mafi.Core.Trains.ITrainTrackBuffer, Mafi.Core.Trains.ITrainTrackManagedEntity, Mafi.Core.Trains.ITrainTracksGraphPiece, Mafi.Serialization.IIsSafeAsHashKey { + void RemoveAndCarryOverProducts(); + }
LayoutEntityWithTrainTrackBase class changed public abstract class LayoutEntityWithTrainTrackBase { + protected virtual bool IsPaidForByReplacedBuiltTracks(Mafi.Collections.ReadonlyCollections.ReadOnlyArraySlice<Mafi.Core.Trains.TrainTrack> replacedTracks); + protected void RemoveAndCarryOverProducts(); + protected void StartDeconstructionLeavingTrack(); + public void TakeOverConstructionProducts(Mafi.Core.Economy.AssetValue products); }
LevelCrossing class changed public class LevelCrossing { + public void TakeOverConstructionProducts(Mafi.Core.Economy.AssetValue products); }
LevelCrossingEntranceProto class changed public class LevelCrossingEntranceProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string SoundPrefabPath; } }
LevelCrossingProto class changed public class LevelCrossingProto { + public bool BlocksTrainTraffic { get; } }
LocoSoundSpecs struct removed - public readonly struct LocoSoundSpecs { - public readonly Mafi.Core.Entities.SoundSpec BrakingSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec EngineIdleSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec EngineMovingSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec HornSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec MotionSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec StoppedSoundSpec; - public LocoSoundSpecs(Mafi.Core.Entities.SoundSpec motionSoundSpec, Mafi.Core.Entities.SoundSpec brakingSoundSpec, Mafi.Core.Entities.SoundSpec stoppedSoundSpec, Mafi.Core.Entities.SoundSpec engineIdleSoundSpec, Mafi.Core.Entities.SoundSpec engineMovingSoundSpec, Mafi.Core.Entities.SoundSpec hornSoundSpec); - }
Locomotive class changed public class Locomotive { + : Mafi.Core.Environment.IExplicitlyPollutingEntity }
LocomotiveProto class changed public class LocomotiveProto { new public class Gfx { - public readonly Mafi.Core.Entities.SoundSpec EngineIdleSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec EngineMovingSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec HornSoundSpec; public Gfx( string prefabPath, float carWidthMeters, float carHeightMeters, float wheelRadiusMeters, Mafi.Core.Trains.TrainColor defaultColor, float orderInBuildMenu, string customSideViewIconPath = "", string frontBogieModelName = "", string rearBogieModelName = "", string frontCouplerName = "FrontCoupler", string rearCouplerName = "RearCoupler", string frontCarConnectorName = "", string rearCarConnectorName = "", float frontCarConnectorSize = 0, float rearCarConnectorSize = 0, string wheelModelPrefix = "wheel", Mafi.Option<Mafi.Core.Entities.Dynamic.VehicleExhaustParticlesSpec> exhaustParticlesSpec = default, bool useAnimationForWheelMovement = false, bool useAnimationForEngineThrottle = false, float throttleAnimationSpeedIdle = 0.25, float throttleAnimationSpeedFullPower = 1, Mafi.Percent alterLocoAtAnimPercent = default, string signMeshPrefix = "", - Mafi.Core.Trains.LocoSoundSpecs soundSpecs = default, ); } }
ReverseTrainCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class ReverseTrainCmd { }
SetTrainDrivingModeCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class SetTrainDrivingModeCmd { }
SetTrainLineColorSourceCmd class changed + [System.ObsoleteAttribute("Use SetTrainLineColorCmd")] public class SetTrainLineColorSourceCmd { }
SetTrainPreferredDirectionCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class SetTrainPreferredDirectionCmd { }
SetTrainSpeedCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class SetTrainSpeedCmd { }
SetTrainTrackBufferTurnaroundCmd class added + [Mafi.Serialization.GenerateSerializer] + public class SetTrainTrackBufferTurnaroundCmd : Mafi.Core.Input.InputCommand { + public readonly bool AllowsTurnaround; + public readonly Mafi.Core.EntityId BufferId; + public SetTrainTrackBufferTurnaroundCmd(Mafi.Core.EntityId bufferId, bool allowsTurnaround); + new public static Mafi.Core.Trains.SetTrainTrackBufferTurnaroundCmd Deserialize(Mafi.Serialization.BlobReader reader); + public static void Serialize(Mafi.Core.Trains.SetTrainTrackBufferTurnaroundCmd value, Mafi.Serialization.BlobWriter writer); + }
StoppedPuff struct added + public readonly struct StoppedPuff { + public readonly int CarIndex; + public readonly float Volume; + public StoppedPuff(int carIndex, float volume); + }
TenderWagonProto class changed public class TenderWagonProto { new public class Gfx { public Gfx( string prefabPath, float carWidthMeters, float carHeightMeters, float wheelRadiusMeters, Mafi.Core.Trains.TrainColor defaultColor, float orderInBuildMenu, string customSideViewIconPath = "", string frontBogieModelName = "", string rearBogieModelName = "", string frontCouplerName = "FrontCoupler", string rearCouplerName = "RearCoupler", string frontCarConnectorName = "", string rearCarConnectorName = "", float frontCarConnectorSize = 0, float rearCarConnectorSize = 0, string wheelModelPrefix = "wheel", Mafi.Option<Mafi.Core.Entities.Dynamic.VehicleExhaustParticlesSpec> exhaustParticlesSpec = default, - Mafi.Core.Trains.TrainCarSoundSpecs soundSpecs = default, string pileObjectPath = "", string animationStateName = "", Mafi.Core.Factory.LoosePileTextureParams pileTextureParams = default, ); } }
ToggleTrainFullEmptyDebugCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class ToggleTrainFullEmptyDebugCmd { }
TrackReplacingEntityBaseProto class added + public abstract class TrackReplacingEntityBaseProto : Mafi.Core.Trains.EntityWithTrainTrackBaseProto, Mafi.Core.Entities.IEntityProto, Mafi.Core.Entities.Static.IStaticEntityProto, Mafi.Core.Entities.Static.Layout.ILayoutEntityProto, Mafi.Core.Prototypes.IProto, Mafi.Core.Prototypes.IProtoWithIcon, Mafi.Core.Prototypes.IProtoWithTiers, Mafi.Core.Prototypes.IProtoWithUpgrade, Mafi.Core.Prototypes.IProtoWithUpgradeAndCustomUi, Mafi.Core.Trains.IEntityWithTrainTrackBaseProto, Mafi.Core.Trains.ITrainTrackMayBeElevatedProto, Mafi.Core.Trains.ITrainTrackWithSmallerInterTrackLayoutProto { + public TrackReplacingEntityBaseProto(Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Entities.Static.Layout.EntityLayout customInterTrackLayout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Core.Trains.TrainTrackTrajectoryData trajectoryData, Mafi.Core.Trains.PoleGenerationMode poleGenerationMode, bool isElevated, Mafi.Core.Trains.EntityWithTrainTrackBaseProto.Gfx graphics, Mafi.RelTile1f? maxSpeedTilesPerTick = null, Mafi.Duration? constructionDurationPerProduct = null); + public bool CanReplaceTrack(Mafi.Core.Trains.TrainTrackProto trackProto); + public void InitializeFlippedProto(Mafi.Core.Trains.TrackReplacingEntityBaseProto flipped); + public void InitializeTrackProto(Mafi.Core.Trains.TrainTrackProto trackProto); + public T SelectBetweenElevatedAndGround<T>(Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Core.TileTransform transform) where T : class, Mafi.Core.Trains.ITrainTrackMayBeElevatedProto; + public Mafi.Option<Mafi.Core.Trains.ITrainTrackMayBeElevatedProto> ElevationFlippedProto { get; } + public Mafi.Core.Entities.Static.Layout.EntityLayout SmallerInterTrackLayout { get; } + public Mafi.Option<Mafi.Core.Trains.TrainTrackProto> UnderlyingTrackProto { get; } + }
Train class changed public class Train { + public static readonly Mafi.Core.Factory.ProductivityCounterLabels ACTIVITY_STATS_LABELS; + public static readonly Mafi.Core.Factory.ProductivityCounterLabels TRAVEL_STATS_LABELS; + void Mafi.Core.Trains.ITrainFriend.SimUpdateNotSpawned(); + public void NotifyRefueling(); + public void NotifyStationCannotWork(); + public void NotifyTransfersBlocked(); + public Mafi.Core.Factory.ProductivityCounterHistory ActivityStats { get; } + public Mafi.Core.Factory.ProductivityCounterHistory.Data ActivityStatsOngoingMonth { get; } + public int ActivityStatsOngoingMonthTicks { get; } + public Mafi.Core.Factory.ProductivityCounterHistory TravelStats { get; } + public Mafi.Core.Factory.ProductivityCounterHistory.Data TravelStatsOngoingMonth { get; } + public int TravelStatsOngoingMonthTicks { get; } }
TrainCarBase class changed public abstract class TrainCarBase { + : Mafi.Core.Entities.IEntityWithLinkedParts + public void GetLinkedParts(Mafi.Collections.Lyst<Mafi.Core.Entities.IRenderedEntity> outParts); }
TrainCarBaseProto class changed public abstract class TrainCarBaseProto { new public class Gfx { - public readonly Mafi.Core.Entities.SoundSpec BrakingSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec MotionSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec StoppedSoundSpec; public Gfx( string prefabPath, float carWidthMeters, float carHeightMeters, float wheelRadiusMeters, Mafi.Core.Trains.TrainColor defaultColor, float orderInBuildMenu, string customSideViewIconPath = "", string frontBogieModelName = "", string rearBogieModelName = "", string frontCouplerName = "FrontCoupler", string rearCouplerName = "RearCoupler", string frontCarConnectorName = "", string rearCarConnectorName = "", float frontCarConnectorSize = 0, float rearCarConnectorSize = 0, string wheelModelPrefix = "wheel", Mafi.Option<Mafi.Core.Entities.Dynamic.VehicleExhaustParticlesSpec> exhaustParticlesSpec = default, bool useAnimationForWheelMovement = false, - Mafi.Core.Trains.TrainCarSoundSpecs soundSpecs = default, ); } }
TrainCarSoundSpecs struct removed - public readonly struct TrainCarSoundSpecs { - public readonly Mafi.Core.Entities.SoundSpec BrakingSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec MotionSoundSpec; - public readonly Mafi.Core.Entities.SoundSpec StoppedSoundSpec; - public TrainCarSoundSpecs(Mafi.Core.Entities.SoundSpec motionSoundSpec, Mafi.Core.Entities.SoundSpec brakingSoundSpec, Mafi.Core.Entities.SoundSpec stoppedSoundSpec); - }
TrainControlMode enum added + public enum TrainControlMode { + FollowTargetSpeed = 0, + Coast = 1, + HoldWithBrakes = 2, + }
TrainStaticData class changed public class TrainStaticData { + public Mafi.Fix64 ComputeSpeedAfterTick(Mafi.Fix64 speed, Mafi.RelTile1f targetSpeed, Mafi.Fix32 massTons, Mafi.Fix32 naturalForceKn, Mafi.Fix32 availableTractiveEffortKn, Mafi.Core.Trains.TrainControlMode mode, bool applyFunFactor, out Mafi.Fix64 acceleration, out Mafi.Fix32 tractiveEffortKn, out Mafi.Fix32 brakingForceKn); + public Mafi.Quantity RadiationShieldedCapacity { get; } }
TrainStationCheatAssignedProductCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class TrainStationCheatAssignedProductCmd { }
TrainStationModuleBaseProto class changed public abstract class TrainStationModuleBaseProto { + public readonly bool IsRadiationShielded; public TrainStationModuleBaseProto( Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Core.Trains.TrainTrackTrajectoryData trajectoryData, Mafi.Core.Products.ProductType productType, Mafi.Electricity powerConsumption, Mafi.Core.Trains.EntityWithTrainTrackBaseProto.Gfx graphics, Mafi.RelTile1f? maxSpeedTilesPerTick = null, Mafi.Duration? constructionDurationPerProduct = null, Mafi.Upoints? boostCost = null, bool cannotBeReflected = false, + bool isRadiationShielded = false, ); + public bool AcceptsProduct(Mafi.Core.Products.ProductProto product); }
TrainStationWaypointBaseProto class changed public abstract class TrainStationWaypointBaseProto { + : Mafi.Core.Trains.TrackReplacingEntityBaseProto - public void InitializeFlippedProto(Mafi.Core.Trains.TrainStationWaypointBaseProto flipped); - public void InitializeTrackProto(Mafi.Core.Trains.TrainTrackProto trackProto); - public T SelectBetweenElevatedAndGround<T>(Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Core.TileTransform transform) where T : class, Mafi.Core.Trains.ITrainTrackMayBeElevatedProto; - public Mafi.Option<Mafi.Core.Trains.ITrainTrackMayBeElevatedProto> ElevationFlippedProto { get; } - public Mafi.Core.Entities.Static.Layout.EntityLayout SmallerInterTrackLayout { get; } - public Mafi.Option<Mafi.Core.Trains.TrainTrackProto> UnderlyingTrackProto { get; } }
TrainStoppedPuffs class added + public static class TrainStoppedPuffs { + public static void Compute(Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.RelTile1f> carLengths, Mafi.RelTile1f runLength, Mafi.Collections.Lyst<Mafi.Core.Trains.StoppedPuff> puffsOut); + }
TrainTrack class changed public class TrainTrack { + public void TakeOverConstructionProducts(Mafi.Core.Economy.AssetValue products); }
TrainTrackBufferBaseProto class added + public abstract class TrainTrackBufferBaseProto : Mafi.Core.Trains.TrackReplacingEntityBaseProto { + public TrainTrackBufferBaseProto(Mafi.Core.Entities.Static.StaticEntityProto.ID id, Mafi.Core.Prototypes.Proto.Str strings, Mafi.Core.Entities.Static.Layout.EntityLayout layout, Mafi.Core.Entities.Static.Layout.EntityLayout customInterTrackLayout, Mafi.Core.Prototypes.EntityCosts costs, Mafi.Core.Trains.TrainTrackTrajectoryData trajectoryData, Mafi.Core.Trains.PoleGenerationMode poleGenerationMode, bool isElevated, bool isBumperAtTrajectoryEnd, Mafi.Core.Trains.EntityWithTrainTrackBaseProto.Gfx graphics, Mafi.RelTile1f? maxSpeedTilesPerTick = null, Mafi.Duration? constructionDurationPerProduct = null); + public Mafi.Core.Trains.TrainTrackBufferBaseProto GetVariantForFreeEnds(bool startIsFree, bool endIsFree); + public void InitializeReversedProto(Mafi.Core.Trains.TrainTrackBufferBaseProto reversed); + public bool IsBumperAtTrajectoryEnd { get; } + public Mafi.Option<Mafi.Core.Trains.TrainTrackBufferBaseProto> ReversedProto { get; } + }
TrainTrackGradeFactorExtensions class changed public static class TrainTrackGradeFactorExtensions { - public static Mafi.Core.Trains.TrainTrackGradeFactor Max(this Mafi.Core.Trains.TrainTrackGradeFactor g, Mafi.Core.Trains.TrainTrackGradeFactor other); + public static Mafi.Core.Trains.TrainTrackGradeFactor Steepest(this Mafi.Core.Trains.TrainTrackGradeFactor g, Mafi.Core.Trains.TrainTrackGradeFactor other); }
TrainTrackProto class changed public class TrainTrackProto { + public void InitializeTrackBufferProto(Mafi.Core.Trains.TrainTrackBufferBaseProto proto); + public Mafi.Option<Mafi.Core.Trains.TrainTrackBufferBaseProto> TrackBufferProto { get; } }
TrainTracksGraphManager class changed + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_unlockedProtosDb", 342, typeof(Mafi.Core.Prototypes.UnlockedProtosDb))] public class TrainTracksGraphManager { + : Mafi.Core.Input.ICommandProcessor<Mafi.Core.Trains.SetTrainTrackBufferTurnaroundCmd> public TrainTracksGraphManager( Mafi.Core.Entities.EntitiesManager entitiesManager, Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Core.Terrain.TerrainOccupancyManager occupancyManager, Mafi.Core.Trains.TrainTracksPillarManager pillarManager, Mafi.Option<Mafi.Core.Trains.ITrainTracksPolesManager> polesManager, Mafi.Core.Trains.TrainTrackBuilder trainTrackBuilder, - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.LazyResolve<Mafi.Core.Trains.TrainsManager> trainsManager, Mafi.Core.Entities.Static.UpgradesManager upgradesManager, Mafi.Core.Entities.Static.ConstructionManager constructionManager, ); + public static bool IsBuiltTrack(Mafi.Core.Entities.Static.IStaticEntity track); + public bool IsTrackEndFree(Mafi.Core.Trains.IEntityWithTrainTrack track, bool atTrajectoryEnd, bool countUnbuiltTracks = false); + public bool IsTrackEndFree(Mafi.Core.Trains.TrainTrackGraphNodeKey nodeKey, bool countUnbuiltTracks = false); + public bool IsTrafficDeadEnd(Mafi.Core.TrainGraphNodeId nodeId, out Mafi.Core.TrainTrackId blockingTrackId); + public bool IsTurnaroundRefused(Mafi.Core.TrainTrackId trackId); + void Mafi.IAction<Mafi.Core.Trains.SetTrainTrackBufferTurnaroundCmd>.Invoke(Mafi.Core.Trains.SetTrainTrackBufferTurnaroundCmd cmd); + public void NotifyTurnaroundChanged(Mafi.Core.Trains.ITrainTrackBuffer buffer); }
TrainTracksGraphManagerBase<TTrack> class changed public abstract class TrainTracksGraphManagerBase<TTrack> { + [Mafi.Serialization.DoNotSaveCreateNewOnLoadAttribute] + protected readonly Mafi.Collections.Lyst<Mafi.Core.TrainTrackId> m_buffersAtNodeTmp; + protected void GetBuffersAtNode(Mafi.Core.TrainGraphNodeId nodeId, Mafi.Collections.Lyst<Mafi.Core.TrainTrackId> buffersTmp); public void GetOutgoingNeighbours( Mafi.Core.TrainGraphNodeId nodeId, Mafi.Collections.Lyst<Mafi.Core.Trains.TrainGraphNodeWithEdge> neighbours, bool enabledOnly = false, bool electrifiedOnly = false, System.Predicate<Mafi.Core.TrainGraphNodeId> blockAtDepots = null, Mafi.Collections.BitMap? blockedTracks = null, Mafi.Collections.BitMap? enabledTracksSnapshot = null, + bool pathableOnly = false, ); + public bool IsTrackBuffer(Mafi.Core.TrainTrackId trackId); + protected virtual void OnTrackRegistered(Mafi.Core.TrainTrackId trackId, TTrack trackEntity); + protected bool UpdateTrackBit(ref Mafi.Collections.BitMap map, Mafi.Core.TrainTrackId trackId, bool value); + public bool HasAnyTrackBuffers { get; } }
TrainTracksPillarManager class changed + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_unlockedProtosDb", 342, typeof(Mafi.Core.Prototypes.UnlockedProtosDb))] public class TrainTracksPillarManager { public TrainTracksPillarManager( - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Core.Terrain.TerrainOccupancyManager occupancyManager, Mafi.Core.Entities.EntitiesManager entitiesManager, Mafi.Core.Trains.TrainTrackBuilder trainTrackBuilder, Mafi.Core.Trains.TrainTrackPillarsBuilder pillarsBuilder, Mafi.Core.Entities.Static.IConstructionManager constructionManager, ); }
TrainWagonTypePathfindingRestriction class changed public class TrainWagonTypePathfindingRestriction { public enum WagonTypeKind { + RadiationShielded = 6, } }
TrainsPathFinder class changed public class TrainsPathFinder { + public void Uninitialize(); }
}
namespace Mafi.Core.Utils {
ChangelogEntry struct changed public readonly struct ChangelogEntry { + public System.DateTime? GetDate(); + public Mafi.Option<string> GetName(); + public bool IsMilestone(); }
ChangelogSubEntry struct changed public readonly struct ChangelogSubEntry { + public readonly System.DateTime? Date; + public readonly Mafi.Option<string> DateText; + public readonly Mafi.Option<string> Name; + public readonly string VersionText; }
ChangelogUtils class changed public static class ChangelogUtils { - public static readonly System.Collections.Generic.IReadOnlyDictionary<string, string> PATCH_NOTES_TRANSLATIONS; - public static string GetChangeLog(Mafi.Core.IFileSystemHelper fsHelper, string onlyAfterVersion, bool reversePatchesOrder, System.Collections.Generic.IEnumerable<string> changelogContentOverride = null); - public static string GetChangeLogForCurrentMinorVersion(Mafi.Core.IFileSystemHelper fsHelper, System.Collections.Generic.IEnumerable<string> changelogContentOverride = null); + public static string GetHeadingVersionText(string heading); - public static string GetLatestPatchChangeLog(Mafi.Core.IFileSystemHelper fsHelper, bool untilMajorVersion, bool reversePatchesOrder, System.Collections.Generic.IEnumerable<string> changelogContentOverride = null); + public static string GetLatestPatchChangeLogIfRecent(Mafi.Core.IFileSystemHelper fsHelper, System.DateTime today, System.TimeSpan maxAge, System.Collections.Generic.IEnumerable<string> changelogContentOverride = null); + public static void ParseHeadingParts(string heading, out Mafi.Option<string> name, out System.DateTime? date, out Mafi.Option<string> dateText); }
InfoOverlayAverage struct added + [Mafi.Serialization.GenerateSerializer] + public readonly struct InfoOverlayAverage { + public const int SHORT_BUCKET_DAYS = 3; + public const int TICKS_PER_SHORT_BUCKET = 60; + [Mafi.PureAttribute] + public Mafi.Core.Utils.InfoOverlayAverage Add(Mafi.Fix64 amount, Mafi.GameDate today, Mafi.Core.Utils.InfoOverlayAverage.Resolution resolution); + [Mafi.PureAttribute] + public Mafi.Core.Utils.InfoOverlayAverage AddToBucket(Mafi.Fix64 amount, int bucket, Mafi.Core.Utils.InfoOverlayAverage.Resolution resolution); + public static Mafi.Core.Utils.InfoOverlayAverage Deserialize(Mafi.Serialization.BlobReader reader); + public static int GetBucket(Mafi.GameDate date, Mafi.Core.Utils.InfoOverlayAverage.Resolution resolution); + [Mafi.PureAttribute] + public bool IsZero(Mafi.GameDate today, Mafi.Core.Utils.InfoOverlayAverage.Resolution resolution); + [Mafi.PureAttribute] + public Mafi.Fix64 PerMonth(Mafi.GameDate today, Mafi.Core.Utils.InfoOverlayAverage.Resolution resolution); + public static void RemoveDestroyedEntities<TEntity, TValue>(Mafi.Collections.Dict<TEntity, TValue> records, string owner) where TEntity : Mafi.Core.Entities.IEntity; + public static void Serialize(Mafi.Core.Utils.InfoOverlayAverage value, Mafi.Serialization.BlobWriter writer); + public enum Resolution { + Short = 0, + Monthly = 1, + } + }
SetInstaBuildCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class SetInstaBuildCmd { }
}
namespace Mafi.Core.Vehicles {
IVehicleCargo interface removed - public interface IVehicleCargo { - bool CanAdd(Mafi.Core.Products.ProductProto product); - void GetCargoProducts(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> cacheToPopulate); - Mafi.Collections.Lyst<System.Collections.Generic.KeyValuePair<Mafi.Core.Products.ProductProto, Mafi.Quantity>>.Enumerator GetEnumerator(); - Mafi.Quantity GetQuantityOf(Mafi.Core.Products.ProductProto product); - bool HasProduct(Mafi.Core.Products.ProductProto product); - int Count { get; } - Mafi.Core.ProductQuantity FirstOrPhantom { get; } - bool IsEmpty { get; } - bool IsNotEmpty { get; } - Mafi.QuantityLarge LifetimeLoadedQuantity { get; } - Mafi.Quantity TotalQuantity { get; } - }
IVehicleForCargoJob interface changed public interface IVehicleForCargoJob { + bool CanLoad(Mafi.Core.Products.ProductProto product); + void ReceiveExactlyFrom(Mafi.Core.Entities.Static.IProductBuffer source, Mafi.Quantity quantity); - Mafi.Core.Vehicles.IVehicleCargo Cargo { get; } + Mafi.Core.ProductQuantity Cargo { get; } }
RegisteredInputBuffer class changed public class RegisteredInputBuffer { + public Mafi.Quantity AcceptCargo(Mafi.Core.Vehicles.Jobs.ICargoDeliveryJob job, Mafi.Quantity maxQuantity, Mafi.Quantity reserved); }
RegisteredOutputBuffer class changed public class RegisteredOutputBuffer { + public Mafi.Quantity ReleaseCargo(Mafi.Core.Vehicles.Jobs.ICargoPickUpJob job, Mafi.Quantity maxToPickUp, Mafi.Quantity reserved); }
VehicleCargo class changed + [Mafi.Serialization.OnlyForSaveCompatibilityAttribute] public class VehicleCargo { - : Mafi.Core.Vehicles.IVehicleCargo - public void Add(Mafi.Core.ProductQuantity pq); - public void Add(Mafi.Core.Products.ProductProto product, Mafi.Quantity quantity); - public bool CanAdd(Mafi.Core.Products.ProductProto product); - public void ClearAllProductsDoNotReport(); - public void ClearAndStoreAllProducts(Mafi.Core.Economy.IAssetTransactionManager assetTransactionManager); - public void ClearAndStoreProduct(Mafi.Core.Products.ProductProto product, Mafi.Core.Economy.IAssetTransactionManager assetTransactionManager); - public void DestroyAllProducts(Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Products.DestroyReason reason); - public void ExecutePlan(); - public void GetCargoProducts(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> cacheToPopulate); - public bool HasProduct(Mafi.Core.Products.ProductProto product); - public void PlanAdd(Mafi.Core.ProductQuantity pq); - public void PlanRemove(Mafi.Core.ProductQuantity pq); - public void RemoveExactly(Mafi.Core.ProductQuantity pq); - public void RemoveExactly(Mafi.Core.Products.ProductProto product, Mafi.Quantity removedQuantity); - public Mafi.Quantity TryRemoveAsMuchAs(Mafi.Core.ProductQuantity pq); - public Mafi.Quantity TryRemoveAsMuchAs(Mafi.Core.Products.ProductProto product, Mafi.Quantity removedQuantity); - public Mafi.Core.ProductQuantity FirstOrPhantom { get; } }
}
namespace Mafi.Core.Vehicles.Commands {
AddVehicleToBuildQueueCmd class changed public class AddVehicleToBuildQueueCmd { + public const int MAX_COUNT = 100; }
AssignVehicleTypeToEntityCmd class changed public class AssignVehicleTypeToEntityCmd { + public const int MAX_COUNT = 100; }
CreateAndSpawnVehicle class changed + [Mafi.Core.Input.CheatCommandAttribute] public class CreateAndSpawnVehicle { }
FinishVehicleBuildCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class FinishVehicleBuildCmd { }
RemoveAndDestroyVehicle class changed + [Mafi.Core.Input.CheatCommandAttribute] public class RemoveAndDestroyVehicle { }
UnassignVehicleFromEntityCmd class changed public class UnassignVehicleFromEntityCmd { + public const int MAX_COUNT = 100; }
VehicleCheatProductCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class VehicleCheatProductCmd { }
VehicleCommandsProcessor class changed public class VehicleCommandsProcessor { public VehicleCommandsProcessor( Mafi.Core.Vehicles.VehiclesManager vehiclesManager, Mafi.Core.Vehicles.VehicleBuffersRegistry vehicleBuffersRegistry, Mafi.Core.Entities.EntitiesManager entitiesManager, Mafi.Core.Prototypes.ProtosDb protosDb, - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.VehicleJobId.Factory jobIdFactory, Mafi.Core.Entities.EntitiesCreator entitiesCreator, Mafi.Core.Vehicles.Jobs.NavigateToJob.Factory navigateToJobFactory, Mafi.Core.PathFinding.Goals.VehicleGoalsFactory vehicleGoalsFactory, Mafi.Core.Population.IUpointsManager upointsManager, Mafi.Core.Economy.IAssetTransactionManager assetManager, Mafi.Core.Vehicles.LogisticsZonesManager logisticsZonesManager, ); }
}
namespace Mafi.Core.Vehicles.Excavators {
Excavator class changed public sealed class Excavator { + public void GetCargoBreakdown(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public void GetCargoProducts(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); - public Mafi.Core.Vehicles.IVehicleCargo Cargo { get; } + public Mafi.Core.ProductQuantity Cargo { get; } + [Mafi.Serialization.NewInSaveVersionAttribute(334)] + public Mafi.QuantityLarge LifetimeLoadedQuantity { get; } + public Mafi.Quantity TotalCargoQuantity { get; } }
ExcavatorProto class changed public class ExcavatorProto { + public Mafi.Option<Mafi.Core.Products.MixedMaterialCategory> MinedCategory { get; } new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<string> DigSounds; + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<string> DumpSounds; public Gfx( string prefabPath, Mafi.RelTile2f frontContactPtsOffset, Mafi.RelTile2f rearContactPtsOffset, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Dynamic.DynamicEntityDustParticlesSpec> dustParticles, Mafi.Option<Mafi.Core.Entities.Dynamic.VehicleExhaustParticlesSpec> exhaustParticlesSpec, string engineSoundPath, string movementSoundPath, string cabinModelName, string leftTrackModelName, string rightTrackModelName, Mafi.RelTile1f spacingBetweenTracks, Mafi.RelTile1f trackTextureLength, string idleStateName, string pileParentPath, string pileModelName, - Mafi.Collections.ImmutableCollections.ImmutableArray<string> digSounds, + Mafi.Collections.ImmutableCollections.ImmutableArray<string> digSounds = default, - Mafi.Collections.ImmutableCollections.ImmutableArray<string> dumpSounds, + Mafi.Collections.ImmutableCollections.ImmutableArray<string> dumpSounds = default, Mafi.Option<string> customIconPath = default, Mafi.AngleDegrees1f cabinAngleCompensation = default, ); } }
}
namespace Mafi.Core.Vehicles.Jobs {
CargoDeliveryJob class changed public sealed class CargoDeliveryJob { + public Mafi.Core.ProductQuantity GetAnimatingCargo(); + public void GetAnimatingCargoBreakdown(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public int GetAnimatingCargoBreakdown(ref System.Collections.Generic.KeyValuePair<Mafi.Core.Products.ProductSlimId, Mafi.Quantity>[] result); }
CargoPickUpJob class changed public sealed class CargoPickUpJob { + : Mafi.Core.Vehicles.Jobs.IVehicleJobWithProducts + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; }
IVehicleJobWithProducts interface added + public interface IVehicleJobWithProducts : Mafi.Core.Vehicles.Jobs.IVehicleJob, Mafi.Core.Vehicles.Jobs.IVehicleJobReadOnly, Mafi.Serialization.IIsSafeAsHashKey { + void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + }
}
namespace Mafi.Core.Vehicles.RocketTransporters {
RocketTransporterProto class changed public class RocketTransporterProto { + : Mafi.Core.Prototypes.IProtoWithOwnedProtos + public void GetOwnedProtos(Mafi.Collections.Lyst<Mafi.Core.Prototypes.IProto> ownedProtos); }
}
namespace Mafi.Core.Vehicles.TreePlanters {
TreePlanter class changed public class TreePlanter { + public bool CanLoad(Mafi.Core.Products.ProductProto product); + public void ReceiveExactlyFrom(Mafi.Core.Entities.Static.IProductBuffer source, Mafi.Quantity quantity); - public Mafi.Core.Vehicles.IVehicleCargo Cargo { get; } + public Mafi.Core.ProductQuantity Cargo { get; } }
}
namespace Mafi.Core.Vehicles.Trucks {
Truck class changed public sealed class Truck { + : Mafi.Core.Entities.IEntityWithProducts + public bool CanLoad(Mafi.Core.Products.ProductProto product); + public Mafi.Quantity DestroyCargo(Mafi.Core.Products.ProductProto product, Mafi.Quantity maxQuantity, Mafi.Core.Products.DestroyReason reason); + public void ForEachHeldProduct<TConsumer>(TConsumer consumer) where TConsumer : class, Mafi.IConsumer<Mafi.Core.ProductQuantity>; + public Mafi.Quantity GetAvailableQuantityOf(Mafi.Core.Products.ProductProto product); + public void GetCargoBreakdown(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public void GetCargoBreakdownForVisuals(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public int GetCargoBreakdownForVisuals(ref System.Collections.Generic.KeyValuePair<Mafi.Core.Products.ProductSlimId, Mafi.Quantity>[] result); + public Mafi.Core.ProductQuantity GetCargoForVisuals(); + public void GetCargoProducts(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public void GetCargoViewForJobSearch(Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> result); + public void ReceiveExactlyFrom(Mafi.Core.Entities.Static.IProductBuffer source, Mafi.Quantity quantity); + public bool TryDiscardCargo(); - public Mafi.Collections.PooledArray<Mafi.Core.ProductQuantity> TryGetCargoToDiscard(); - public Mafi.Core.Vehicles.IVehicleCargo Cargo { get; } + public Mafi.Core.ProductQuantity Cargo { get; } + [Mafi.Serialization.NewInSaveVersionAttribute(334)] + public Mafi.QuantityLarge LifetimeLoadedQuantity { get; } + public int MemberCount { get; } }
TruckQueue class changed public class TruckQueue { - public Mafi.Option<Mafi.Core.Vehicles.Trucks.Truck> TryGetFirstTruckFor(Mafi.Core.Vehicles.IVehicleCargo cargo); }
}
+ namespace Mafi.Core.WebApi {
IWebApiConfig interface added + public interface IWebApiConfig { + int? GetPersistentPort(); + void SetPersistentPort(int? port); + }
WebApiServer class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public sealed class WebApiServer : System.IDisposable { + public const int DEFAULT_PORT = 3073; + public void Dispose(); + public void EnsureRoutesScanned(); + public int? GetPersistentPort(); + public bool RegisterRoute(string path, Mafi.Core.WebApi.WebRouteStage stage, System.Delegate handler, string method = "GET", string description = ""); + public int ScanObjectForRoutes(object target); + public void Stop(); + public bool TrySetPersistentPort(int? port, out string error); + public bool TryStart(int port, out string error); + public bool UnregisterRoute(string path, string method = "GET"); + public int UnregisterRoutesOf(object target); + public bool IsRunning { get; } + public int Port { get; } + public Mafi.IEventNonSaveable Started { get; } + public Mafi.IEventNonSaveable Stopped { get; } + }
WebPendingResponse class added + public sealed class WebPendingResponse { + public WebPendingResponse(); + public bool Complete(Mafi.Core.WebApi.WebRouteResponse response); + public static Mafi.Core.WebApi.WebPendingResponse Completed(Mafi.Core.WebApi.WebRouteResponse response); + }
WebRouteAttribute class added + [Mafi.MeansImplicitUseAttribute] + public sealed class WebRouteAttribute : System.Attribute { + public readonly string Description; + public readonly string Method; + public readonly string Path; + public readonly Mafi.Core.WebApi.WebRouteStage Stage; + public WebRouteAttribute(string path, Mafi.Core.WebApi.WebRouteStage stage, string method = "GET", string description = ""); + }
WebRouteRequest class added + public sealed class WebRouteRequest { + public readonly string Body; + public readonly byte[] BodyBytes; + public readonly string Method; + public readonly string Path; + public static bool TryCreate(string method, string target, byte[] bodyBytes, Mafi.Collections.Dict<string, string> headers, out Mafi.Core.WebApi.WebRouteRequest request, out string error); + public static bool TryCreate(string method, string target, string body, Mafi.Collections.Dict<string, string> headers, out Mafi.Core.WebApi.WebRouteRequest request, out string error); + public bool TryGetHeader(string name, out string value); + public bool TryGetQuery(string name, out string value); + }
WebRouteResponse class added + public sealed class WebRouteResponse { + public const string CONTENT_TYPE_HTML = …; + public const string CONTENT_TYPE_JSON = …; + public const string CONTENT_TYPE_TEXT = …; + public readonly string ContentType; + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<System.Collections.Generic.KeyValuePair<string, string>> Headers; + public static readonly Mafi.Core.WebApi.WebRouteResponse NoContent; + public readonly int Status; + public static Mafi.Core.WebApi.WebRouteResponse Bytes(string contentType, byte[] data, int status = 200); + public static Mafi.Core.WebApi.WebRouteResponse Error(int status, string message); + public byte[] GetBodyBytes(); + public string GetBodyText(); + public static Mafi.Core.WebApi.WebRouteResponse Html(string html); + public static Mafi.Core.WebApi.WebRouteResponse Json(string json, int status = 200); + public static Mafi.Core.WebApi.WebRouteResponse Text(string text, int status = 200); + public Mafi.Core.WebApi.WebRouteResponse WithHeader(string name, string value); + }
WebRouteStage enum added + public enum WebRouteStage { + Background = 0, + Sim = 1, + Sync = 2, + Main = 3, + }
+ }
namespace Mafi.Core.World {
BattleShip class changed public class BattleShip { - public System.Collections.Generic.IReadOnlyDictionary<Mafi.Core.Products.ProductProto, Mafi.Core.Entities.Static.IProductBuffer> Cargo { get; } + public System.Collections.Generic.IReadOnlyDictionary<Mafi.Core.Products.ProductProto, Mafi.Core.Entities.Static.IPlainProductBuffer> Cargo { get; } }
BattleShipProto class changed public class BattleShipProto { new public class Gfx { + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string ArrivalSoundPath; + [System.ObsoleteAttribute("No longer used, entity sounds come from the bindings.tbl registered by SoundBindingsRegistrator.RegisterFromAssembly.")] public readonly string DepartureSoundPath; } }
ExploreFinishCheatCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class ExploreFinishCheatCmd { }
FleetRepairCheatCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class FleetRepairCheatCmd { }
TeleportFleetToLocationCheatCmd class changed + [Mafi.Core.Input.CheatCommandAttribute] public class TeleportFleetToLocationCheatCmd { }
}
namespace Mafi.Core.World.Contracts {
ContractsManager class changed + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_unlockedProtosDb", 342, typeof(Mafi.Core.Prototypes.UnlockedProtosDb))] public class ContractsManager { public ContractsManager( Mafi.Core.Prototypes.ProtosDb protosDb, - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.PropertiesDb.IPropertiesDb propsDb, Mafi.Core.Population.IUpointsManager upointsManager, Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.World.IWorldMapManager worldMapManager, ); }
}
namespace Mafi.Core.World.Loans {
LoansManager class changed + [Mafi.Serialization.MemberRemovedInSaveVersionAttribute("m_unlockedProtosDb", 342, typeof(Mafi.Core.Prototypes.UnlockedProtosDb))] public class LoansManager { public LoansManager( Mafi.Core.Buildings.Cargo.TradeDockManager tradeDockManager, Mafi.Core.Prototypes.ProtosDb protosDb, - Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Core.Notifications.INotificationsManager notificationsManager, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.Products.IProductsManager productsManager, Mafi.Core.Economy.IAssetTransactionManager assetTransactionManager, Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.Game.GameDifficultyApplier difficultyApplier, ); }
}
namespace Mafi.Unity {
AssetsDb class changed public sealed class AssetsDb { + public void MarkRuntimeOverrideLoadFinished(); + public void MarkRuntimeOverrideLoadStarted(); + public bool RemoveRuntimeOverride(string assetPath); + public void SetRuntimeOverride(string assetPath, UnityEngine.Object asset); + public bool TryGetRuntimeOverride(string assetPath, out UnityEngine.Object asset); + public int PendingRuntimeOverrides { get; } + public int RuntimeOverridesVersion { get; } }
GlobalPlayerPrefs class changed public class GlobalPlayerPrefs { + : Mafi.Core.WebApi.IWebApiConfig + public static readonly Mafi.Unity.PlayerPrefEnum<Mafi.Unity.RealTimeClockMode> RealTimeClock; + public static readonly Mafi.Unity.PlayerPrefInt WebApiPersistentPort; + int? Mafi.Core.WebApi.IWebApiConfig.GetPersistentPort(); + void Mafi.Core.WebApi.IWebApiConfig.SetPersistentPort(int? port); }
IMain interface changed public interface IMain { - void GoToMainMenu(Mafi.Unity.MainMenu.MainMenuArgs args); + void GoToMainMenu(Mafi.Unity.MainMenu.MainMenuArgs args, bool displayLoadingScreen = true); + Mafi.Core.PromoCode.IPlatformUserIdProvider PlatformUserIdProvider { get; } + Mafi.Unity.Audio.UiSoundsPlayer UiSounds { get; } }
IUnityInputMgr interface changed public interface IUnityInputMgr { + void OpenControlsSettings(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); void RegisterGlobalShortcut( - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut, + Mafi.Unity.InputControl.KbHandle shortcut, Mafi.Unity.InputControl.IUnityInputController controller, ); void RegisterGlobalShortcut( - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut, + Mafi.Unity.InputControl.KbHandle shortcut, System.Func<bool> callback, ); }
Main class changed public class Main { public Main( Mafi.Core.IFileSystemHelper fsHelper, Mafi.Unity.ISteamOverlayHelper steamOverlay, + Mafi.Core.PromoCode.IPlatformUserIdProvider platformUserIdProvider, Mafi.Unity.AssetsDb assetsDb, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Mods.LoadedModData> coreMods, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Mods.AvailableModData> dlcMods, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Mods.AvailableModData> thirdPartyMods, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Mods.InvalidModData> invalidMods, Mafi.Collections.ImmutableCollections.ImmutableArray<UnityEngine.GameObject> persistentGos, System.Action<Mafi.Localization.LocStrFormatted> showFatalErrorAndTerminate, ); - public void GoToMainMenu(Mafi.Unity.MainMenu.MainMenuArgs args); + public void GoToMainMenu(Mafi.Unity.MainMenu.MainMenuArgs args, bool displayLoadingScreen = true); + public Mafi.Core.PromoCode.IPlatformUserIdProvider PlatformUserIdProvider { get; } + public Mafi.Unity.Audio.UiSoundsPlayer UiSounds { get; } }
Mouse class changed public static class Mouse { + public static float GetScrollWheel(); }
RealTimeClockMode enum added + public enum RealTimeClockMode { + Off = 0, + Hours12 = 1, + Hours24 = 2, + }
RenderingSettingOption struct changed public readonly struct RenderingSettingOption { - public readonly Mafi.Localization.LocStrFormatted Name; - public readonly Mafi.Localization.LocStrFormatted Tooltip; + public RenderingSettingOption(Mafi.Localization.LocStr name, int value, Mafi.Unity.RenderingSettingPreset preset = None, bool isSupported = true, Mafi.Localization.LocStr tooltip = default); + public Mafi.Localization.LocStrFormatted Name { get; } + public Mafi.Localization.LocStrFormatted Tooltip { get; } }
RenderingSettingsManager class changed public static class RenderingSettingsManager { - public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Collections.Pair<Mafi.Unity.RenderingSettingPreset, Mafi.Localization.LocStrFormatted>> Presets; + public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Collections.Pair<Mafi.Unity.RenderingSettingPreset, Mafi.Localization.LocStr>> Presets; }
UiHotReloader class changed public class UiHotReloader { public UiHotReloader( Mafi.Unity.IUnityInputMgr inputManager, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.DependencyResolver resolver, Mafi.Core.Console.GameConsoleCommandsExecutor consoleCommandsExecutor, + Mafi.Core.WebApi.WebApiServer webApiServer, Mafi.Unity.IMain main, ); }
}
namespace Mafi.Unity.Audio {
AudioChannel enum removed - public enum AudioChannel { - Master = 0, - Music = 1, - EffectsGroup = 2, - UserInterface = 3, - Machines = 4, - Weather = 5, - }
AudioDb class changed public class AudioDb { - : Mafi.Db<string, UnityEngine.AudioSource> - public bool ContainsAsset(string assetPath); - public UnityEngine.Audio.AudioMixerGroup GetChannel(Mafi.Unity.Audio.AudioChannel channel); + public UnityEngine.Audio.AudioMixerGroup GetChannel(Mafi.Core.Audio.SoundChannel channel); - public float GetChannelVolume(Mafi.Unity.Audio.AudioChannel channel); + public float GetChannelVolume(Mafi.Core.Audio.SoundChannel channel); - public UnityEngine.AudioSource GetClonedAudio(Mafi.Unity.Audio.AudioInfo audio); - public UnityEngine.AudioSource GetClonedAudio(string prefabPath, Mafi.Unity.Audio.AudioChannel channel, Mafi.Option<UnityEngine.GameObject> parentGo = default); - public UnityEngine.AudioSource GetSharedAudio(Mafi.Unity.Audio.AudioInfo audio); - public UnityEngine.AudioSource GetSharedAudio(string prefabPath, Mafi.Unity.Audio.AudioChannel channel); - public UnityEngine.AudioSource GetSharedAudioUi(string prefabPath); - public void SetChannelVolume(Mafi.Unity.Audio.AudioChannel channel, float volumePercent); + public void SetChannelVolume(Mafi.Core.Audio.SoundChannel channel, float volumePercent); - public bool TryGetSharedClip(string prefabPath, out UnityEngine.AudioClip clip); + public bool TryGetSharedClip(string assetPath, out UnityEngine.AudioClip clip); }
AudioInfo struct removed - public struct AudioInfo { - public readonly Mafi.Unity.Audio.AudioChannel Channel; - public readonly string PrefabPath; - public AudioInfo(string prefabPath, Mafi.Unity.Audio.AudioChannel channel); - }
EntityAudioManager class removed - [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] - public class EntityAudioManager { - public EntityAudioManager(Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.Audio.AudioDb audioDb, Mafi.Unity.Camera.CameraController cameraController, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.IFileSystemHelper fsHelper); - public Mafi.Option<Mafi.Unity.Audio.EntitySoundMb> CreateSound(Mafi.Unity.Entities.EntityMb owner, Mafi.Core.Entities.SoundParams soundParams); - public Mafi.Option<Mafi.Unity.Audio.EntitySoundMb> CreateSound(Mafi.Unity.Entities.EntityMb owner, Mafi.Core.Entities.SoundSpec soundParams, Mafi.Unity.Audio.AudioChannel channel = Machines); - public Mafi.Unity.Audio.AudioDb AudioDb { get; } - }
EntitySoundMb class removed - public class EntitySoundMb : UnityEngine.MonoBehaviour, Mafi.Unity.Entities.IDestroyableEntityMb { - public EntitySoundMb(); - public void ApplyParam(float param); - public void ApplyParam(float param, float baseVolume, float basePitch); - public void Destroy(); - public void FadeToVolume(float volume); - public void Play(); - public void RenderUpdate(Mafi.Core.GameTime gameTime); - public void RenderUpdate(Mafi.Core.GameTime gameTime, bool isPlaying); - public void SetPitchMultiplier(float pitch); - public void SetVolumeMultiplier(float volumeMultiplier); - public void UpdatePlay(bool isPlaying); - public string Desc { get; } - public bool DoNotLimit { get; } - public float FadeOnChange { get; } - public bool IsDestroyed { get; } - public bool IsPlaying { get; } - public int Key { get; } - public bool Loop { get; } - public int MaxDistance { get; } - public float OriginalVolume { get; } - }
TerrainCollapseSounds class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public sealed class TerrainCollapseSounds { + public TerrainCollapseSounds(Mafi.Core.Terrain.Physics.ITerrainPhysicsSimulator physicsSimulator, Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Unity.Audio.Engine.SoundEngine soundEngine, Mafi.Core.Audio.SoundTuningTable tuning, Mafi.Unity.Camera.SimCameraState cameraState, Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents); + }
UiSoundsPlayer class added + public sealed class UiSoundsPlayer { + public UiSoundsPlayer(Mafi.Unity.Audio.AudioDb audioDb, Mafi.Unity.AssetsDb assetsDb); + public void ClearTuningSource(); + public void Play(Mafi.Option<Mafi.Core.Audio.SoundProto> sound); + public void Play(Mafi.Unity.Audio.UiSound sound); + public void PlayChannelPreview(Mafi.Core.Audio.SoundChannel channel); + public void SetTuningSource(Mafi.Core.Audio.SoundTuningTable table); + }
}
+ namespace Mafi.Unity.Audio.Engine {
SoundCandidate struct added + public readonly struct SoundCandidate { + public readonly float CentroidX; + public readonly float CentroidZ; + public readonly float DistanceM; + public readonly int Group; + public readonly long Key; + public readonly float Pan; + public readonly float Pitch; + public readonly float Rank; + public readonly float Volume; + public SoundCandidate(long key, int group, float volume, float rank, float pan, float pitch, float centroidX, float centroidZ, float distanceM); + public Mafi.Unity.Audio.Engine.SoundCandidate WithVolume(float volume, float rank); + }
SoundCell struct added + public readonly struct SoundCell { + public readonly int Count; + public readonly long Key; + public readonly float MaxG2; + public readonly ulong Occupancy; + public readonly float SumG2; + public readonly float SumG2Pitch; + public readonly float SumG2R2; + public readonly float SumG2X; + public readonly float SumG2Y; + public readonly float SumG2Z; + public SoundCell(long key, float sumG2, float sumG2X, float sumG2Y, float sumG2Z, float sumG2Pitch, float sumG2R2, int count, float maxG2, ulong occupancy); + }
SoundCellTable class added + public sealed class SoundCellTable { + public const int BASE_LEVEL = 2; + public const float CELL_ANGULAR_SIZE = 0.21; + public const float CELL_CORNER_FRACTION = 0.71; + public const float CELL_SIZE_M = 32; + public const int INDIVIDUAL_LEVEL = 5; + public const float LEVEL_HYSTERESIS = 0.15; + public const byte LEVEL_UNSET = 255; + public const int MAX_GROUPS = 65536; + public const int MAX_LEVEL = 3; + public const int MERGED_LEVEL = 4; + public const int MIN_LEVEL = 0; + public const int MIN_STATIC_LEVEL = 1; + public SoundCellTable(); + public void Add(long key, float gain, float xM, float yM, float zM, float pitch); + public void AddCell(in Mafi.Unity.Audio.Engine.SoundCell cell); + public static bool AreAdjacent(long keyA, long keyB); + public static bool AreNested(long keyA, long keyB); + public static float CellCentre(int cell, int level); + public static int CellOf(float metres, int level); + public static float CellOriginX(long key); + public static float CellOriginZ(long key); + public static float CellSizeOfLevel(int level); + public static int CellXOfKey(long key); + public static int CellZOfKey(long key); + public static int CrowdTierOfKey(long key); + public static int EmitterSlotOfKey(long key); + public static int EmitterVersionOfKey(long key); + public Mafi.Unity.Audio.Engine.SoundCell GetCell(int touchedIndex); + public float GetCellHeight(int touchedIndex); + public long GetCellKey(int touchedIndex); + public static int GroupOfKey(long key); + public static int IdealLevelSq(float distanceSq, int minLevel); + public static bool IsCell(long key); + public static bool IsIndividual(long key); + public static bool IsMerged(long key); + public static bool IsMergedCrowd(long key); + public static int LevelForSq(float distanceSq, byte previousLevel, int minLevel); + public static int LevelOfKey(long key); + public static int MaskEmitterVersion(int version); + public static long PackIndividualKey(int clipGroup, int emitterSlot, int emitterVersion); + public static long PackKey(int clipGroup, int level, int cellX, int cellZ); + public static long PackMergedCrowdKey(int clipGroup, int tier); + public static long PackMergedLeadKey(int clipGroup); + public void Reset(); + public int CellCount { get; } + }
SoundClipGroups class added + public sealed class SoundClipGroups { + public SoundClipGroups(Mafi.Core.Audio.SoundTuningTable tuning, Mafi.Unity.Audio.Engine.SoundClipsLoader clipsLoader); + public void Build(); + public UnityEngine.AudioClip GetClip(int group, int clipIndex); + public UnityEngine.AudioClip GetCrowdClip(int group, int clipIndex, int tier); + public Mafi.Unity.Audio.Engine.SoundClipGroups.Group GetGroup(int group); + public float GetLongestClipSec(int group); + public int GetMaxCrowdTier(int group); + public Mafi.Core.Audio.SoundProto GetRepresentative(int group); + public Mafi.Core.Audio.SoundTuning GetTuning(int group); + public int GroupOf(int soundIndex); + public int PickClipIndex(int group); + public void PreloadCrowdClips(); + public void RefreshTuning(); + public int GroupCount { get; } + public readonly struct Group { + public readonly float ClusterGainCap; + public readonly float Cutoff; + public readonly float Falloff; + public readonly int MaxVoices; + public readonly int RepresentativeSound; + public Group(int representativeSound); + public Group(int representativeSound, float falloff, float cutoff, int maxVoices, float clusterGainCap); + } + }
SoundClipsLoader class added + public sealed class SoundClipsLoader { + public SoundClipsLoader(Mafi.Unity.AssetsDb assetsDb); + public bool AssetExists(string path); + public bool ClipExists(string path); + public bool IsRuntimeOverride(string path); + public bool TryGetClip(string path, out UnityEngine.AudioClip clip); + }
SoundEmitterId struct added + public readonly struct SoundEmitterId : System.IEquatable<Mafi.Unity.Audio.Engine.SoundEmitterId> { + public readonly int Index; + public static readonly Mafi.Unity.Audio.Engine.SoundEmitterId None; + public readonly int Version; + public bool Equals(Mafi.Unity.Audio.Engine.SoundEmitterId other); + public bool IsValid { get; } + }
SoundEmitterRegistry class added + public sealed class SoundEmitterRegistry { + public const float ONE_SHOT_GRANT_TIMEOUT_SEC = 0.35; + public SoundEmitterRegistry(); + public Mafi.Unity.Audio.Engine.SoundEmitterId CreateEmitter(int soundIndex); + public Mafi.Unity.Audio.Engine.SoundEmitterId CreateEmitter(int soundIndex, Mafi.Core.Prototypes.Proto.ID bindingEntity, string bindingRole); + public Mafi.Unity.Audio.Engine.SoundEmitterId CreateOneShot(int soundIndex, float lifetimeSec, float volume, float pitch); + public byte GetCellLevel(int slot); + public float GetParam(int slot); + public float GetPitchScale(int slot); + public int GetSoundIndex(int slot); + public int GetTransientCount(int soundIndex); + public int GetVersion(int slot); + public float GetVolumeScale(int slot); + public float GetX(int slot); + public float GetY(int slot); + public float GetZ(int slot); + public bool IsAlive(Mafi.Unity.Audio.Engine.SoundEmitterId id); + public bool IsSounding(int slot); + public bool IsTransient(int slot); + public void MarkOneShotGranted(int slot, int maskedVersion); + public void ReleaseAllOneShots(); + public void ReleaseEmitter(Mafi.Unity.Audio.Engine.SoundEmitterId id); + public void ReleaseFinishedOneShot(int slot, int maskedVersion); + public void ReresolveBindings(Mafi.Core.Audio.SoundBindingsTable bindings, Mafi.Core.Audio.SoundTuningTable tuning); + public void SetCellLevel(int slot, byte level); + public void SetIsOn(Mafi.Unity.Audio.Engine.SoundEmitterId id, bool isOn); + public void SetOrigin(Mafi.Unity.Audio.Engine.SoundEmitterId id, float xM, float yM, float zM); + public void SetParam(Mafi.Unity.Audio.Engine.SoundEmitterId id, float param); + public void SetPitchScale(Mafi.Unity.Audio.Engine.SoundEmitterId id, float pitchScale); + public void SetVolumeScale(Mafi.Unity.Audio.Engine.SoundEmitterId id, float volumeScale); + public void UpdateLifetimes(float deltaSec); + public int AliveCount { get; } + public int SlotsInUse { get; } + }
SoundEngine class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public sealed class SoundEngine : System.IDisposable { + public const int DEFAULT_QUALITY_INDEX = 1; + public const string QUALITY_PLAYER_PREF = …; + public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<int> QUALITY_VOICE_LIMITS; + public const int TOP_QUALITY_VOICE_LIMIT = 64; + public SoundEngine(Mafi.Core.Audio.SoundTuningTable tuning, Mafi.Core.Audio.SoundBindingsTable bindings, Mafi.Unity.Audio.AudioDb audioDb, Mafi.Unity.AssetsDb assetsDb, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Unity.Camera.SimCameraState cameraState, Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents); + public Mafi.Unity.Audio.Engine.SoundEmitterId CreateEmitter(Mafi.Core.Audio.SoundProto sound); + public Mafi.Unity.Audio.Engine.SoundEmitterId CreateEmitter(Mafi.Core.Prototypes.Proto.ID entityProtoId, string role); + public void Dispose(); + public static int GetQualityIndexSetting(); + public bool IsAlive(Mafi.Unity.Audio.Engine.SoundEmitterId id); + public Mafi.Unity.Audio.Engine.SoundEmitterId PlayOnce(Mafi.Core.Audio.SoundProto sound, Mafi.Tile3f position); + public Mafi.Unity.Audio.Engine.SoundEmitterId PlayOnce(Mafi.Core.Audio.SoundProto sound, Mafi.Tile3f position, float volume, float pitch); + public Mafi.Unity.Audio.Engine.SoundEmitterId PlayOnce(Mafi.Core.Prototypes.Proto.ID entityProtoId, string role, Mafi.Tile3f position); + public Mafi.Unity.Audio.Engine.SoundEmitterId PlayOnce(Mafi.Core.Prototypes.Proto.ID entityProtoId, string role, Mafi.Tile3f position, float volume, float pitch); + public void ReleaseEmitter(Mafi.Unity.Audio.Engine.SoundEmitterId id); + public void ReloadQualitySetting(); + public void SetIsOn(Mafi.Unity.Audio.Engine.SoundEmitterId id, bool isOn); + public void SetOrigin(Mafi.Unity.Audio.Engine.SoundEmitterId id, Mafi.Tile3f position); + public void SetParam(Mafi.Unity.Audio.Engine.SoundEmitterId id, float param); + public void SetPitchScale(Mafi.Unity.Audio.Engine.SoundEmitterId id, float pitchScale); + public void SetVolumeScale(Mafi.Unity.Audio.Engine.SoundEmitterId id, float volumeScale); + public Mafi.Unity.Audio.Engine.SoundClipsLoader Clips { get; } + public int ClipsRebuildCount { get; } + public float FadeHeightFraction { get; } + public bool IsSilenced { get; } + public Mafi.Unity.Audio.Engine.SoundVoicePool Pool { get; } + public float WorldVolumeScale { get; set; } + }
SoundPass enum added + public enum SoundPass { + Sim = 0, + Main = 1, + Emitters = 2, + StaticCells = 3, + DynamicCells = 4, + Candidates = 5, + Rank = 6, + VoiceAlloc = 7, + VoiceApply = 8, + }
SoundSourceTables class added + public static class SoundSourceTables { + public static Mafi.Collections.Lyst<Mafi.Core.Audio.SoundTableSource> CollectForEditing(string overrideDir); + public static Mafi.Collections.Lyst<Mafi.Core.Audio.SoundTableSource> CollectFromSourceTree(); + public static Mafi.Collections.Lyst<string> GetExistingDirs(); + }
SoundStaticEmitters class added + public sealed class SoundStaticEmitters { + public SoundStaticEmitters(); + public void DrainPending(Mafi.Core.Audio.SoundBindingsTable bindings, Mafi.Core.Audio.SoundTuningTable tuning, Mafi.Unity.Audio.Engine.SoundClipGroups groups); + public void QueueAdd(Mafi.Core.Entities.IEntity entity); + public void QueueRefresh(Mafi.Core.Entities.IEntity entity); + public void QueueRemove(Mafi.Core.Entities.IEntity entity); + public void ResolveSounds(Mafi.Core.Audio.SoundBindingsTable bindings, Mafi.Core.Audio.SoundTuningTable tuning, Mafi.Unity.Audio.Engine.SoundClipGroups groups); + public void SumInto(Mafi.Unity.Audio.Engine.SoundCellTable cells, float listenerX, float listenerZ, UnityEngine.Vector3 eye, float fadeHeightFraction); + public void TryAdd(Mafi.Core.Entities.IEntity entity, Mafi.Core.Audio.SoundBindingsTable bindings, Mafi.Core.Audio.SoundTuningTable tuning, Mafi.Unity.Audio.Engine.SoundClipGroups groups); + public int Count { get; } + public int SampleCount { get; } + public int SoundingCount { get; } + }
SoundTimings class added + public sealed class SoundTimings { + public const int HISTORY_FRAMES = 240; + public const int PASS_COUNT = 9; + public SoundTimings(); + public void AddCollector(); + public float AvgMs(Mafi.Unity.Audio.Engine.SoundPass pass); + public long Begin(); + public void BeginFrame(); + public void End(Mafi.Unity.Audio.Engine.SoundPass pass, long startedAt); + public float LastMs(Mafi.Unity.Audio.Engine.SoundPass pass); + public float MaxMs(Mafi.Unity.Audio.Engine.SoundPass pass); + public float MinMs(Mafi.Unity.Audio.Engine.SoundPass pass); + public void PushFrame(); + public void RemoveCollector(); + }
SoundVoiceManager class added + public sealed class SoundVoiceManager { + public const float STOP_AFTER_SILENT_SEC = 0.03; + public SoundVoiceManager(Mafi.Unity.Audio.Engine.SoundVoicePool pool, Mafi.Unity.Audio.Engine.SoundClipGroups groups, Mafi.Unity.Audio.Engine.SoundTimings timings); + public void ReadTuning(Mafi.Core.Audio.SoundTuningTable tuning); + public void RecoverAfterAudioReset(); + public void SetPaused(bool isPaused); + public void StopAll(); + public void Update(Mafi.Collections.Lyst<Mafi.Unity.Audio.Engine.SoundCandidate> candidates, int worldVoiceLimit, float deltaSec); + public int EvictionsThisFrame { get; } + public Mafi.Collections.ReadonlyCollections.IIndexable<long> FinishedOneShotKeys { get; } + public int PlayingCount { get; } + public Mafi.Collections.ReadonlyCollections.IIndexable<long> StartedOneShotKeys { get; } + }
SoundVoicePool class added + public sealed class SoundVoicePool { + public const int VOICE_HEADROOM = 16; + public const int WORLD_VOICES = 80; + public SoundVoicePool(Mafi.Unity.Audio.AudioDb audioDb, int ambientVoicesCount); + public void Dispose(); + public UnityEngine.AudioSource Get(int voice); + public void SetChannel(int voice, Mafi.Core.Audio.SoundChannel channel); + public int AmbientStart { get; } + public int AmbientVoicesCount { get; } + public int Count { get; } + }
+ }
namespace Mafi.Unity.Camera {
DollyCameraModel class changed public class DollyCameraModel { + public UnityEngine.Vector3 GetFocusPointMeters(); }
ICameraModel interface changed public interface ICameraModel { + UnityEngine.Vector3 GetFocusPointMeters(); }
OrbitalCameraModel class changed public class OrbitalCameraModel { + public UnityEngine.Vector3 GetFocusPointMeters(); }
SimCameraState class changed public sealed class SimCameraState { public SimCameraState( Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Unity.Camera.CameraController cameraController, + Mafi.Core.Audio.SoundTuningTable soundTuning, ); public sealed class Snapshot { + public UnityEngine.Vector3 CamRight { get; } + public UnityEngine.Vector3 ListenerPos { get; } } }
}
namespace Mafi.Unity.Entities {
DelayedEntitiesRenderer class changed public abstract class DelayedEntitiesRenderer { + public virtual void SetInfoOverlayColor(Mafi.Core.Entities.IRenderedEntity entity, Mafi.ColorRgba fadeFrom, Mafi.ColorRgba color); }
EntitiesAudioUpdater class removed - [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] - public class EntitiesAudioUpdater : Mafi.Unity.Entities.IEntityMbUpdater { - public EntitiesAudioUpdater(Mafi.Unity.Audio.EntityAudioManager audioManager); - public void AddOnSyncIfNeeded(Mafi.Unity.Entities.EntityMb entityMb); - public void RemoveOnSyncIfNeeded(Mafi.Unity.Entities.EntityMb entityMb); - public void RenderUpdate(Mafi.Core.GameTime time); - public void RenderUpdateAfterSync(Mafi.Core.GameTime time); - public void SimEndUpdate(); - public void SyncUpdate(Mafi.Core.GameTime time); - public string Name { get; } - }
EntitiesIconRenderer class changed public class EntitiesIconRenderer { + public void ReleaseAllBaseSlots(); + public void ReleaseBaseSlot(Mafi.Core.Entities.IRenderedEntity entity); + public void ReserveBaseSlot(Mafi.Core.Entities.IRenderedEntity entity); + public bool TryGetBaseSlotPosition(Mafi.Core.Entities.IRenderedEntity entity, out UnityEngine.Vector3 position); }
EntitiesRenderingManager class changed public class EntitiesRenderingManager { public EntitiesRenderingManager( Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Entities.Static.ConstructionManager constructionManager, + Mafi.AllImplementationsOf<Mafi.Unity.Entities.IEntityPartsInfoOverlayRenderer> partsInfoOverlayRenderers, ); + public void SetInfoOverlayColor(Mafi.Core.Entities.IRenderedEntity entity, Mafi.ColorRgba fadeFrom, Mafi.ColorRgba color); }
EntityMb class changed public abstract class EntityMb { + protected void ApplyInfoOverlayColorTo(UnityEngine.GameObject child); + public void SetInfoOverlayColor(Mafi.ColorRgba fadeFrom, Mafi.ColorRgba color); }
IEntitiesRenderer interface changed public interface IEntitiesRenderer { + void SetInfoOverlayColor(Mafi.Core.Entities.IRenderedEntity entity, Mafi.ColorRgba fadeFrom, Mafi.ColorRgba color); }
IEntityPartsInfoOverlayRenderer interface added + [Mafi.MultiDependencyAttribute] + public interface IEntityPartsInfoOverlayRenderer { + void SetInfoOverlayColor(Mafi.Core.Entities.IRenderedEntity entity, Mafi.ColorRgba fadeFrom, Mafi.ColorRgba color); + }
MbBasedEntitiesRenderer class changed public class MbBasedEntitiesRenderer { public MbBasedEntitiesRenderer( Mafi.Unity.Entities.EntitiesRenderingManager entitiesRenderingManager, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.Entities.EntityMbFactory entityMbFactory, Mafi.AllImplementationsOf<Mafi.Unity.Entities.IEntityMbUpdater> updaters, Mafi.AllImplementationsOf<Mafi.Unity.Entities.IEntityMbInitializer> initializers, Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.ObjectHighlighter highlighter, Mafi.Unity.Entities.EntitiesIconRenderer entitiesIconRenderer, + Mafi.Unity.InfoOverlays.InfoOverlayEntityColors infoOverlayColors, ); }
}
namespace Mafi.Unity.Entities.Dynamic {
DynamicGroundEntityDeps class changed public class DynamicGroundEntityDeps { + public readonly Mafi.Unity.Audio.Engine.SoundEngine SoundEngine; public DynamicGroundEntityDeps( Mafi.Unity.Particles.DustParticlesController particlesController, Mafi.Unity.Entities.Dynamic.VehiclesRenderingManager vehiclesRenderingManager, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, ); }
DynamicGroundEntityMb class changed public class DynamicGroundEntityMb { - public void OnDestroy(); + public virtual void OnDestroy(); }
}
namespace Mafi.Unity.Entities.Ships {
ShipMb class changed public class ShipMb { public void Initialize( Mafi.Core.Entities.Ships.Ship ship, - Mafi.Unity.Audio.EntityAudioManager audioManager, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, Mafi.Core.Environment.WeatherManager weatherManager, Mafi.IRandom rng, ); + protected void PlayOneShotFollowing(string role); + protected Mafi.Unity.Audio.Engine.SoundEngine Sounds { get; } }
}
namespace Mafi.Unity.Entities.Static {
BillboardMb class changed public class BillboardMb { + public static Mafi.ColorRgba AdjustColorForSign(Mafi.Base.Prototypes.Buildings.BillboardProto proto, Mafi.ColorRgba color); }
InstancedChunkBasedLayoutEntitiesRenderer class changed public class InstancedChunkBasedLayoutEntitiesRenderer { + public static readonly Mafi.ColorRgba NO_TINT_COLOR; public InstancedChunkBasedLayoutEntitiesRenderer( Mafi.Unity.Entities.EntitiesRenderingManager entitiesRenderingManager, Mafi.Unity.InstancedRendering.ChunkBasedRenderingManager visibleChunksRenderer, Mafi.Unity.Terrain.TerrainRenderer terrainRenderer, Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.ObjectHighlighter highlighter, Mafi.Unity.Utils.ReloadAfterAssetUpdateManager reloadManager, Mafi.Unity.Entities.EntitiesIconRenderer entitiesIconRenderer, Mafi.Unity.Entities.EntityMbFactory entityMbFactory, Mafi.Unity.Entities.EntitiesAnimationsUpdater entitiesAnimationsUpdater, Mafi.AllImplementationsOf<Mafi.Unity.Entities.IEntityMbUpdater> updaters, Mafi.AllImplementationsOf<Mafi.Unity.Entities.IEntityMbInitializer> initializers, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Simulation.SimLoopEvents simLoopEvents, Mafi.Unity.Entities.ProtoModelFactory protoModelFactory, + Mafi.Unity.InfoOverlays.InfoOverlayEntityColors infoOverlayColors, ); }
RocketLaunchPadMbFactory class changed public class RocketLaunchPadMbFactory { public RocketLaunchPadMbFactory( Mafi.Unity.Entities.ProtoModelFactory modelFactory, - Mafi.Unity.Audio.EntityAudioManager audioManager, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, Mafi.Core.SpaceProgram.IRocketLaunchManager rocketLaunchManager, Mafi.Core.Input.IInputScheduler inputScheduler, ); }
}
namespace Mafi.Unity.Factory.Transports {
TransportPillarsRenderer class changed public class TransportPillarsRenderer { + public void SetInfoOverlayColor(Mafi.Core.Entities.IRenderedEntity entity, Mafi.ColorRgba fadeFrom, Mafi.ColorRgba color); }
}
+ namespace Mafi.Unity.InfoOverlays {
ComputingOverlay class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class ComputingOverlay : Mafi.Unity.InfoOverlays.ProducersConsumersOverlay { + public ComputingOverlay(Mafi.Core.Factory.IComputingManager computingManager); + }
ElectricityOverlay class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class ElectricityOverlay : Mafi.Unity.InfoOverlays.ProducersConsumersOverlay { + public ElectricityOverlay(Mafi.Core.Factory.ElectricPower.ISolarPanelsManager solarPanelsManager, Mafi.Core.Simulation.ICalendar calendar); + }
IInfoOverlay interface added + [Mafi.MultiDependencyAttribute] + public interface IInfoOverlay { + void BeginRefresh(bool showsLiveValues); + void CollectAddedEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + void CollectEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + void FillTerrainMaterialColors(Mafi.ColorRgba[] outColorsBySlimId); + void FinishRefresh(bool resetScale, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + bool IsCandidate(Mafi.Core.Entities.IEntity entity); + void ReleaseRefresh(); + bool FadesColorChanges { get; } + string IconPath { get; } + Mafi.Unity.InfoOverlays.InfoOverlayLegend Legend { get; } + int Order { get; } + Mafi.Unity.InfoOverlays.InfoOverlayTiming Timing { get; } + Mafi.Localization.LocStrFormatted Title { get; } + }
IInfoOverlayWithSettings interface added + public interface IInfoOverlayWithSettings : Mafi.Unity.InfoOverlays.IInfoOverlay { + Mafi.Unity.UiToolkit.Component.UiComponent CreateSettingsUi(System.Action onSettingsChanged); + }
InfoOverlayBadgesRenderer class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public class InfoOverlayBadgesRenderer : Mafi.Unity.InstancedRendering.IRenderedChunkAlwaysVisible, Mafi.Unity.InstancedRendering.IRenderedChunksBase, System.IDisposable { + public InfoOverlayBadgesRenderer(Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.Entities.EntitiesIconRenderer iconRenderer, Mafi.Unity.InstancedRendering.ChunkBasedRenderingManager chunksRenderingManager, Mafi.Unity.Utils.ReloadAfterAssetUpdateManager reloadManager, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents); + public void Clear(); + public void Dispose(); + public void RemoveBadge(Mafi.Core.Entities.IRenderedEntity entity); + public Mafi.Unity.InstancedRendering.RenderStats RenderAlwaysVisible(Mafi.Core.GameTime time, UnityEngine.Bounds bounds); + public void ReportAllRenderedInstances(Mafi.Collections.Lyst<Mafi.Unity.InstancedRendering.RenderedInstancesInfo> info); + public bool TrySetBadge(Mafi.Core.Entities.IRenderedEntity entity, int priority); + public string Name { get; } + }
InfoOverlayEntityColors class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public sealed class InfoOverlayEntityColors : System.IDisposable { + public InfoOverlayEntityColors(Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents); + public void Dispose(); + public bool TryGetColor(Mafi.Core.Entities.IRenderedEntity entity, out Mafi.ColorRgba color); + }
InfoOverlayGradient class added + public static class InfoOverlayGradient { + public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> CONSUMER_STOPS; + public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> PRIORITY_STOPS; + public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> PRODUCER_STOPS; + public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> PRODUCTIVITY_STOPS; + public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> RADIATION_STOPS; + public static Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> CreateQuantizedColors(Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> stops); + public static Mafi.ColorRgba GetColor(Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> stops, float t); + public static Mafi.ColorRgba GetQuantizedColor(Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> quantizedColors, float t); + }
InfoOverlayLegend struct added + public readonly struct InfoOverlayLegend { + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Unity.InfoOverlays.InfoOverlayLegendItem> Items; + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Unity.InfoOverlays.InfoOverlayLegendScale> Scales; + public InfoOverlayLegend(Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Unity.InfoOverlays.InfoOverlayLegendScale> scales, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Unity.InfoOverlays.InfoOverlayLegendItem> items); + }
InfoOverlayLegendItem struct added + public readonly struct InfoOverlayLegendItem { + public readonly Mafi.ColorRgba Color; + public readonly Mafi.Localization.LocStrFormatted Label; + public InfoOverlayLegendItem(Mafi.ColorRgba color, Mafi.Localization.LocStrFormatted label); + }
InfoOverlayLegendScale struct added + public readonly struct InfoOverlayLegendScale { + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> Colors; + public readonly Mafi.Localization.LocStrFormatted EndLabel; + public readonly Mafi.Localization.LocStrFormatted StartLabel; + public readonly Mafi.Localization.LocStrFormatted? Title; + public InfoOverlayLegendScale(Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.ColorRgba> colors, Mafi.Localization.LocStrFormatted startLabel, Mafi.Localization.LocStrFormatted endLabel, Mafi.Localization.LocStrFormatted? title = null); + }
InfoOverlayOrder class added + public static class InfoOverlayOrder { + public const int COMPUTING = 70; + public const int ELECTRICITY = 40; + public const int MAINTENANCE = 60; + public const int POLLUTION = 30; + public const int PRIORITY = 80; + public const int PRODUCTIVITY = 10; + public const int PRODUCT_FLOW = 20; + public const int WORKERS = 50; + }
InfoOverlayRendererColors class added + public static class InfoOverlayRendererColors { + public static void StampSlot(Mafi.Unity.Entities.EntityMb owner, UnityEngine.GameObject root, int slot, Mafi.Option<Mafi.Collections.IReadOnlySet<UnityEngine.Renderer>> skippedRenderers); + public static int StampsVersion { get; } + }
InfoOverlaySyncedPropertyBlock class added + public sealed class InfoOverlaySyncedPropertyBlock { + public InfoOverlaySyncedPropertyBlock(); + public UnityEngine.MaterialPropertyBlock ReadFrom(UnityEngine.Renderer renderer); + }
InfoOverlayTiming enum added + public enum InfoOverlayTiming { + AlwaysAveraged = 0, + AlwaysLive = 1, + Switchable = 2, + }
InfoOverlaysManager class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public class InfoOverlaysManager : System.IDisposable { + public static readonly int GRAYS_BLUEPRINTS_SHADER_ID; + public static readonly Mafi.ColorRgba NEUTRAL_COLOR; + public InfoOverlaysManager(Mafi.Unity.Entities.EntitiesRenderingManager entitiesRenderingManager, Mafi.Unity.InfoOverlays.InfoOverlayEntityColors entityColors, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Unity.Terrain.TerrainRenderer terrainRenderer, Mafi.Core.Input.IInputScheduler inputScheduler, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents); + public Mafi.Unity.Utils.IActivator CreateActivator(Mafi.Unity.InfoOverlays.IInfoOverlay overlay); + public void Dispose(); + public void ReapplySelection(Mafi.Unity.InfoOverlays.IInfoOverlay overlay); + public void SetShowsLiveValues(bool showsLiveValues); + public Mafi.Option<Mafi.Unity.InfoOverlays.IInfoOverlay> SelectedOverlay { get; } + public bool ShowsLiveValues { get; } + }
MaintenanceOverlay class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class MaintenanceOverlay : Mafi.Unity.InfoOverlays.ProducersConsumersOverlay { + public MaintenanceOverlay(Mafi.Core.Maintenance.MaintenanceManager maintenanceManager, Mafi.Core.Products.EntityProductFlowTracker flowTracker); + }
PollutionOverlay class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class PollutionOverlay : Mafi.Unity.InfoOverlays.IInfoOverlay { + public PollutionOverlay(Mafi.Core.Environment.EntityPollutionTracker pollutionTracker, Mafi.Core.Products.EntityProductFlowTracker flowTracker, Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Core.PropertiesDb.IPropertiesDb propertiesDb); + public void BeginRefresh(bool showsLiveValues); + public void CollectAddedEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public void CollectEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public void FillTerrainMaterialColors(Mafi.ColorRgba[] outColorsBySlimId); + public void FinishRefresh(bool resetScale, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public bool IsCandidate(Mafi.Core.Entities.IEntity entity); + public void ReleaseRefresh(); + public bool FadesColorChanges { get; } + public string IconPath { get; } + public Mafi.Unity.InfoOverlays.InfoOverlayLegend Legend { get; } + public int Order { get; } + public Mafi.Unity.InfoOverlays.InfoOverlayTiming Timing { get; } + public Mafi.Localization.LocStrFormatted Title { get; } + }
PriorityOverlay class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class PriorityOverlay : Mafi.Unity.InfoOverlays.IInfoOverlay, Mafi.Unity.InfoOverlays.IInfoOverlayWithSettings { + public PriorityOverlay(Mafi.Unity.InfoOverlays.InfoOverlayBadgesRenderer badgesRenderer); + public void BeginRefresh(bool showsLiveValues); + public void CollectAddedEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public void CollectEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public Mafi.Unity.UiToolkit.Component.UiComponent CreateSettingsUi(System.Action onSettingsChanged); + public void FillTerrainMaterialColors(Mafi.ColorRgba[] outColorsBySlimId); + public void FinishRefresh(bool resetScale, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public bool IsCandidate(Mafi.Core.Entities.IEntity entity); + public void ReleaseRefresh(); + public bool FadesColorChanges { get; } + public string IconPath { get; } + public Mafi.Unity.InfoOverlays.InfoOverlayLegend Legend { get; } + public int Order { get; } + public Mafi.Unity.InfoOverlays.InfoOverlayTiming Timing { get; } + public Mafi.Localization.LocStrFormatted Title { get; } + }
ProducersConsumersOverlay class added + public abstract class ProducersConsumersOverlay : Mafi.Unity.InfoOverlays.IInfoOverlay { + protected ProducersConsumersOverlay(); + protected void AddConsumption(Mafi.Core.Entities.IRenderedEntity entity, float consumption); + protected void AddProduction(Mafi.Core.Entities.IRenderedEntity entity, float production); + public void BeginRefresh(bool showsLiveValues); + protected abstract bool CanProduceOrConsume(Mafi.Core.Entities.IEntity entity); + public void CollectAddedEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public void CollectEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public void FillTerrainMaterialColors(Mafi.ColorRgba[] outColorsBySlimId); + public void FinishRefresh(bool resetScale, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public bool IsCandidate(Mafi.Core.Entities.IEntity entity); + protected virtual void OnBeginRefresh(); + protected virtual void OnFinishRefresh(); + protected virtual void OnReleaseRefresh(); + public void ReleaseRefresh(); + protected abstract bool TryGetConsumption(Mafi.Core.Entities.IEntity entity, out float consumption); + protected abstract bool TryGetProduction(Mafi.Core.Entities.IEntity entity, out float production); + public bool FadesColorChanges { get; } + public abstract string IconPath { get; } + public Mafi.Unity.InfoOverlays.InfoOverlayLegend Legend { get; } + public abstract int Order { get; } + protected bool ShowsLiveValues { get; } + protected virtual bool ShowsSettlementModulesOnHouses { get; } + public abstract Mafi.Unity.InfoOverlays.InfoOverlayTiming Timing { get; } + public abstract Mafi.Localization.LocStrFormatted Title { get; } + }
ProductFlowOverlay class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class ProductFlowOverlay : Mafi.Unity.InfoOverlays.ProducersConsumersOverlay, Mafi.Unity.InfoOverlays.IInfoOverlay, Mafi.Unity.InfoOverlays.IInfoOverlayWithSettings { + public ProductFlowOverlay(Mafi.Core.Products.EntityProductFlowTracker flowTracker, Mafi.Unity.InputControl.UnlockedProtosDbForUi unlockedProtosDb); + public Mafi.Unity.UiToolkit.Component.UiComponent CreateSettingsUi(System.Action onSettingsChanged); + }
ProductivityOverlay class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class ProductivityOverlay : Mafi.Unity.InfoOverlays.IInfoOverlay { + public ProductivityOverlay(); + public void BeginRefresh(bool showsLiveValues); + public void CollectAddedEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public void CollectEntity(Mafi.Core.Entities.IEntity entity, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public void FillTerrainMaterialColors(Mafi.ColorRgba[] outColorsBySlimId); + public void FinishRefresh(bool resetScale, Mafi.Collections.Dict<Mafi.Core.Entities.IRenderedEntity, Mafi.ColorRgba> outColors); + public bool IsCandidate(Mafi.Core.Entities.IEntity entity); + public void ReleaseRefresh(); + public bool FadesColorChanges { get; } + public string IconPath { get; } + public Mafi.Unity.InfoOverlays.InfoOverlayLegend Legend { get; } + public int Order { get; } + public Mafi.Unity.InfoOverlays.InfoOverlayTiming Timing { get; } + public Mafi.Localization.LocStrFormatted Title { get; } + }
WorkersOverlay class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] + public class WorkersOverlay : Mafi.Unity.InfoOverlays.ProducersConsumersOverlay { + public WorkersOverlay(); + }
+ }
namespace Mafi.Unity.InputControl {
BuildingsAssigner class changed public class BuildingsAssigner { public BuildingsAssigner( Mafi.Unity.IUnityInputMgr inputMgr, Mafi.Core.Input.IInputScheduler inputScheduler, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Unity.InputControl.AssignedBuildingsHighlighter highlighter, Mafi.Unity.InputControl.TerrainCursor terrainCursor, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, Mafi.Unity.Camera.CameraController cameraController, Mafi.Unity.LinesFactory linesFactory, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
IShortcutsRegistry interface added + public interface IShortcutsRegistry { + void Add(Mafi.Core.Mods.IMod owner, Mafi.Unity.InputControl.KbHandle handle); + }
KbAttribute class removed - public sealed class KbAttribute : System.Attribute { - public readonly Mafi.Unity.InputControl.KbCategory Category; - public readonly bool IgnoreConflicts; - public readonly bool IsPrimaryReadonly; - public readonly Mafi.Option<string> RequiredDlc; - public readonly Mafi.Localization.LocStrFormatted Title; - public readonly Mafi.Localization.LocStr? Tooltip; - public KbAttribute(Mafi.Unity.InputControl.KbCategory category, string id, string label, string tooltip = null, bool ignoreConflicts = false, bool isPrimaryReadonly = false, string requiredDlc = null); - public KbAttribute(Mafi.Unity.InputControl.KbCategory category, string id, string labelFormat, string formatArg, string tooltip, bool ignoreConflicts = false, bool isPrimaryReadonly = false, string requiredDlc = null); - public string GroupId { get; } - public string PrefsIdPrimary { get; } - public string PrefsIdSecondary { get; } - }
KbCategoriesData class removed - public static class KbCategoriesData { - public static readonly Mafi.Collections.Set<Mafi.Unity.InputControl.KbCategory> MutuallyExclusiveCategories; - public static readonly Mafi.Collections.Dict<Mafi.Unity.InputControl.KbCategory, Mafi.Localization.LocStrFormatted> Translations; - }
KbCategory enum removed - public enum KbCategory { - Camera = 0, - Speed = 1, - Tools = 2, - Designation = 3, - Build = 4, - DragPlacement = 5, - Transport = 6, - TrainTracks = 7, - TrainTracksEdit = 8, - Bridges = 9, - Demolish = 10, - CopyTool = 11, - PauseTool = 12, - Windows = 13, - General = 14, - UiNavigation = 15, - PhotoMode = 16, - MapEditor = 17, - DLC = 18, - }
KbChord struct added + public readonly struct KbChord : System.IEquatable<Mafi.Unity.InputControl.KbChord> { + public static readonly Mafi.Unity.InputControl.KbChord Empty; + public readonly UnityEngine.KeyCode Key; + public readonly Mafi.Unity.InputControl.KbModifiers Modifiers; + public bool AreModifiersHeld(Mafi.Unity.InputControl.KbModifiers heldModifiers); + public bool Equals(Mafi.Unity.InputControl.KbChord other); + public UnityEngine.KeyCode[] GetDisplayKeys(); + public int GetKeysCount(); + public bool IsCode(UnityEngine.KeyCode code); + public bool IsHeldNow(); + public bool IsPartOf(Mafi.Unity.InputControl.KbChord other); + public static Mafi.Unity.InputControl.KbChord Keys(Mafi.Unity.InputControl.KbModifiers modifiers, UnityEngine.KeyCode key = None); + public static Mafi.Unity.InputControl.KbChord Keys(UnityEngine.KeyCode key); + public static Mafi.Unity.InputControl.KbModifiers ModifierOf(UnityEngine.KeyCode key); + public string ToNiceString(); + public string ToPrefsString(); + public static bool TryParsePrefsString(string text, out Mafi.Unity.InputControl.KbChord chord); + public static bool operator ==(Mafi.Unity.InputControl.KbChord left, Mafi.Unity.InputControl.KbChord right); + public static bool operator !=(Mafi.Unity.InputControl.KbChord left, Mafi.Unity.InputControl.KbChord right); + public bool IsEmpty { get; } + public bool IsModifiersOnly { get; } + }
KbExclusiveSet class added + public sealed class KbExclusiveSet { + public readonly string Id; + public KbExclusiveSet(string id); + }
KbExclusiveSets class added + public static class KbExclusiveSets { + public static readonly Mafi.Unity.InputControl.KbExclusiveSet ToolsAndWindows; + }
KbFlags enum added + [System.FlagsAttribute] + public enum KbFlags { + None = 0, + IgnoreConflicts = 1, + PrimaryReadonly = 2, + }
KbGroup class added + public sealed class KbGroup { + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Unity.InputControl.KbExclusiveSet> ExclusiveSets; + public readonly string Id; + public readonly bool IsOwnerDefault; + public readonly string OwnerId; + public KbGroup(string id, Mafi.Localization.LocStr title, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Unity.InputControl.KbExclusiveSet> exclusiveSets = default); + public KbGroup(string id, string title, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Unity.InputControl.KbExclusiveSet> exclusiveSets = default); + public bool CanConflictWith(Mafi.Unity.InputControl.KbGroup other); + public Mafi.Localization.LocStrFormatted FormatTitle(); + }
KbGroups class added + public static class KbGroups { + public static readonly Mafi.Unity.InputControl.KbGroup Bridges; + public static readonly Mafi.Unity.InputControl.KbGroup Build; + public static readonly Mafi.Unity.InputControl.KbGroup Camera; + public static readonly Mafi.Unity.InputControl.KbGroup CopyTool; + public static readonly Mafi.Unity.InputControl.KbGroup Demolish; + public static readonly Mafi.Unity.InputControl.KbGroup Designation; + public static readonly Mafi.Unity.InputControl.KbGroup DragPlacement; + public static readonly Mafi.Unity.InputControl.KbGroup General; + public static readonly Mafi.Unity.InputControl.KbGroup MapEditor; + public static readonly Mafi.Unity.InputControl.KbGroup PauseTool; + public static readonly Mafi.Unity.InputControl.KbGroup PhotoMode; + public static readonly Mafi.Unity.InputControl.KbGroup Speed; + public static readonly Mafi.Unity.InputControl.KbGroup Tools; + public static readonly Mafi.Unity.InputControl.KbGroup TrainTracks; + public static readonly Mafi.Unity.InputControl.KbGroup TrainTracksEdit; + public static readonly Mafi.Unity.InputControl.KbGroup Transport; + public static readonly Mafi.Unity.InputControl.KbGroup UiNavigation; + public static readonly Mafi.Unity.InputControl.KbGroup Windows; + }
KbHandle class added + public sealed class KbHandle { + public readonly Mafi.Unity.InputControl.KeyBindings Default; + public readonly Mafi.Unity.InputControl.KbFlags Flags; + public readonly Mafi.Unity.InputControl.KbGroup Group; + public readonly string Id; + public readonly Mafi.Unity.InputControl.ShortcutMode Mode; + public readonly string OwnerId; + public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<string> SupersededIds; + public Mafi.Localization.LocStrFormatted FormatTitle(); + public Mafi.Localization.LocStrFormatted FormatTooltip(); + public Mafi.Unity.InputControl.KeyBindings Current { get; } + public bool IgnoreConflicts { get; } + public bool IsPrimaryReadonly { get; } + public bool IsRegistered { get; } + }
KbHandleBuilder class added + public sealed class KbHandleBuilder { + public Mafi.Unity.InputControl.KbHandle Build(); + public Mafi.Unity.InputControl.KbHandleBuilder SetFlags(Mafi.Unity.InputControl.KbFlags flags); + public Mafi.Unity.InputControl.KbHandleBuilder SetGroup(Mafi.Unity.InputControl.KbGroup group); + public Mafi.Unity.InputControl.KbHandleBuilder SetMode(Mafi.Unity.InputControl.ShortcutMode mode); + public Mafi.Unity.InputControl.KbHandleBuilder SetPrimary(Mafi.Unity.InputControl.KbChord keys); + public Mafi.Unity.InputControl.KbHandleBuilder SetPrimary(Mafi.Unity.InputControl.KbModifiers modifiers, UnityEngine.KeyCode key = None); + public Mafi.Unity.InputControl.KbHandleBuilder SetPrimary(UnityEngine.KeyCode key); + public Mafi.Unity.InputControl.KbHandleBuilder SetSecondary(Mafi.Unity.InputControl.KbChord keys); + public Mafi.Unity.InputControl.KbHandleBuilder SetSecondary(Mafi.Unity.InputControl.KbModifiers modifiers, UnityEngine.KeyCode key = None); + public Mafi.Unity.InputControl.KbHandleBuilder SetSecondary(UnityEngine.KeyCode key); + public Mafi.Unity.InputControl.KbHandleBuilder SetSupersededIds(params string[] ids); + public Mafi.Unity.InputControl.KbHandleBuilder SetTooltip(Mafi.Localization.LocStr tooltip); + public Mafi.Unity.InputControl.KbHandleBuilder SetTooltip(Mafi.Localization.LocStr1 format, string arg); + public Mafi.Unity.InputControl.KbHandleBuilder SetTooltip(string tooltip); + public Mafi.Unity.InputControl.KbHandleBuilder SetTooltip(string format, string arg); + public static Mafi.Unity.InputControl.KbHandleBuilder Start(string id, Mafi.Localization.LocStr title); + public static Mafi.Unity.InputControl.KbHandleBuilder Start(string id, Mafi.Localization.LocStr1 format, string arg); + public static Mafi.Unity.InputControl.KbHandleBuilder Start(string id, string title); + public static Mafi.Unity.InputControl.KbHandleBuilder Start(string id, string format, string arg); + }
KbModifiers enum added + [System.FlagsAttribute] + public enum KbModifiers { + None = 0, + LeftCtrl = 1, + RightCtrl = 2, + Ctrl = LeftCtrl | RightCtrl, + LeftShift = 4, + RightShift = 8, + Shift = LeftShift | RightShift, + LeftAlt = 16, + RightAlt = 32, + Alt = LeftAlt | RightAlt, + LeftCmd = 64, + RightCmd = 128, + Cmd = LeftCmd | RightCmd, + }
KeyBinding struct removed - public readonly struct KeyBinding { - public readonly Mafi.Unity.InputControl.KbCategory Category; - public static readonly Mafi.Unity.InputControl.KeyBinding EMPTY; - public readonly Mafi.Collections.ImmutableCollections.ImmutableArray<UnityEngine.KeyCode> Keys; - public KeyBinding(Mafi.Unity.InputControl.KbCategory category); - public KeyBinding(Mafi.Unity.InputControl.KbCategory category, Mafi.Collections.ImmutableCollections.ImmutableArray<UnityEngine.KeyCode> keys); - public bool AreSame(Mafi.Unity.InputControl.KeyBinding other); - public static Mafi.Unity.InputControl.KeyBinding Empty(Mafi.Unity.InputControl.KbCategory category); - public static Mafi.Unity.InputControl.KeyBinding FromKey(Mafi.Unity.InputControl.KbCategory category, UnityEngine.KeyCode code); - public static Mafi.Unity.InputControl.KeyBinding FromKeys(Mafi.Unity.InputControl.KbCategory category, UnityEngine.KeyCode code1, UnityEngine.KeyCode code2); - public static Mafi.Unity.InputControl.KeyBinding FromKeys(Mafi.Unity.InputControl.KbCategory category, UnityEngine.KeyCode code1, UnityEngine.KeyCode code2, UnityEngine.KeyCode code3); - public bool IsCode(UnityEngine.KeyCode code); - public string ToNiceString(); - public Mafi.Unity.InputControl.KeyBinding UpdateSelfFrom(string input); - public bool IsEmpty { get; } - }
KeyBindings struct changed public readonly struct KeyBindings { + : System.IEquatable<Mafi.Unity.InputControl.KeyBindings> - public static readonly Mafi.Unity.InputControl.KeyBindings EMPTY; - public readonly Mafi.Unity.InputControl.ShortcutMode Mode; - public readonly Mafi.Unity.InputControl.KeyBinding Primary; + public readonly Mafi.Unity.InputControl.KbChord Primary; - public readonly Mafi.Unity.InputControl.KeyBinding Secondary; + public readonly Mafi.Unity.InputControl.KbChord Secondary; + public static readonly Mafi.Unity.InputControl.KeyBindings Unbound; public KeyBindings( - Mafi.Unity.InputControl.ShortcutMode mode, - Mafi.Unity.InputControl.KeyBinding primary, + Mafi.Unity.InputControl.KbChord primary, - Mafi.Unity.InputControl.KeyBinding secondary, + Mafi.Unity.InputControl.KbChord secondary, ); - public static Mafi.Unity.InputControl.KeyBindings Empty(Mafi.Unity.InputControl.KbCategory category, Mafi.Unity.InputControl.ShortcutMode mode); + public bool Equals(Mafi.Unity.InputControl.KeyBindings other); - public static Mafi.Unity.InputControl.KeyBindings FromKey(Mafi.Unity.InputControl.KbCategory category, Mafi.Unity.InputControl.ShortcutMode mode, UnityEngine.KeyCode code); - public static Mafi.Unity.InputControl.KeyBindings FromKeys(Mafi.Unity.InputControl.KbCategory category, Mafi.Unity.InputControl.ShortcutMode mode, UnityEngine.KeyCode primary, UnityEngine.KeyCode secondary); - public static Mafi.Unity.InputControl.KeyBindings FromKeys(Mafi.Unity.InputControl.KbCategory category, Mafi.Unity.InputControl.ShortcutMode mode, UnityEngine.KeyCode primary, UnityEngine.KeyCode secondary, UnityEngine.KeyCode secondary2); - public static Mafi.Unity.InputControl.KeyBindings FromPrimaryKeys(Mafi.Unity.InputControl.KbCategory category, Mafi.Unity.InputControl.ShortcutMode mode, UnityEngine.KeyCode first, UnityEngine.KeyCode second); + public Mafi.Unity.InputControl.KeyBindings WithPrimary(Mafi.Unity.InputControl.KbChord primary); + public Mafi.Unity.InputControl.KeyBindings WithSecondary(Mafi.Unity.InputControl.KbChord secondary); + public static bool operator ==(Mafi.Unity.InputControl.KeyBindings left, Mafi.Unity.InputControl.KeyBindings right); + public static bool operator !=(Mafi.Unity.InputControl.KeyBindings left, Mafi.Unity.InputControl.KeyBindings right); }
ShortcutMode enum changed public enum ShortcutMode { + Any = Game | MapEditor, }
Shortcuts class added + public static class Shortcuts { + public static readonly Mafi.Unity.InputControl.KbHandle ApplyChanges; + public static readonly Mafi.Unity.InputControl.KbHandle BridgeAlternate; + public static readonly Mafi.Unity.InputControl.KbHandle BridgeForceEndAntiClockwise; + public static readonly Mafi.Unity.InputControl.KbHandle BridgeForceEndClockwise; + public static readonly Mafi.Unity.InputControl.KbHandle BridgeNoTurn; + public static readonly Mafi.Unity.InputControl.KbHandle BridgeSnapping; + public static readonly Mafi.Unity.InputControl.KbHandle ClearDesignation; + public static readonly Mafi.Unity.InputControl.KbHandle CopyExcludingSettings; + public static readonly Mafi.Unity.InputControl.KbHandle DecreaseGameSpeed; + public static readonly Mafi.Unity.InputControl.KbHandle DeleteEntireTransport; + public static readonly Mafi.Unity.InputControl.KbHandle DeleteWithQuickRemove; + public static readonly Mafi.Unity.InputControl.KbHandle DragAdjustSpacing; + public static readonly Mafi.Unity.InputControl.KbHandle DragFillGrid; + public static readonly Mafi.Unity.InputControl.KbHandle DragFreeAngle; + public static readonly Mafi.Unity.InputControl.KbHandle Flip; + public static readonly Mafi.Unity.InputControl.KbHandle FreeLookMode; + public static readonly Mafi.Unity.InputControl.KbHandle IncreaseGameSpeed; + public static readonly Mafi.Unity.InputControl.KbHandle JumpToCameraPosition1; + public static readonly Mafi.Unity.InputControl.KbHandle JumpToCameraPosition2; + public static readonly Mafi.Unity.InputControl.KbHandle JumpToCameraPosition3; + public static readonly Mafi.Unity.InputControl.KbHandle KeepTooltipOpen; + public static readonly Mafi.Unity.InputControl.KbHandle LiftSnapping; + public static readonly Mafi.Unity.InputControl.KbHandle LowerDown; + public static readonly Mafi.Unity.InputControl.KbHandle MoveDown; + public static readonly Mafi.Unity.InputControl.KbHandle MoveLeft; + public static readonly Mafi.Unity.InputControl.KbHandle MoveRight; + public static readonly Mafi.Unity.InputControl.KbHandle MoveUp; + public static readonly Mafi.Unity.InputControl.KbHandle NavigateBack; + public static readonly Mafi.Unity.InputControl.KbHandle NavigateForward; + public static readonly Mafi.Unity.InputControl.KbHandle PanCamera; + public static readonly Mafi.Unity.InputControl.KbHandle PanSpeedBoost; + public static readonly Mafi.Unity.InputControl.KbHandle PauseGame; + public static readonly Mafi.Unity.InputControl.KbHandle PauseMore; + public static readonly Mafi.Unity.InputControl.KbHandle PhotoModeRotation; + public static readonly Mafi.Unity.InputControl.KbHandle PhotoModeTakePicture; + public static readonly Mafi.Unity.InputControl.KbHandle PlaceMultiple; + public static readonly Mafi.Unity.InputControl.KbHandle PrimaryAction; + public static readonly Mafi.Unity.InputControl.KbHandle RaiseUp; + public static readonly Mafi.Unity.InputControl.KbHandle Redo; + public static readonly Mafi.Unity.InputControl.KbHandle Rotate; + public static readonly Mafi.Unity.InputControl.KbHandle RotateClockwise; + public static readonly Mafi.Unity.InputControl.KbHandle RotateCounterClockwise; + public static readonly Mafi.Unity.InputControl.KbHandle SaveCameraPosition1; + public static readonly Mafi.Unity.InputControl.KbHandle SaveCameraPosition2; + public static readonly Mafi.Unity.InputControl.KbHandle SaveCameraPosition3; + public static readonly Mafi.Unity.InputControl.KbHandle Search; + public static readonly Mafi.Unity.InputControl.KbHandle SearchOnMap; + public static readonly Mafi.Unity.InputControl.KbHandle SecondaryAction; + public static readonly Mafi.Unity.InputControl.KbHandle SetGameSpeedTo0; + public static readonly Mafi.Unity.InputControl.KbHandle SetGameSpeedTo1; + public static readonly Mafi.Unity.InputControl.KbHandle SetGameSpeedTo2; + public static readonly Mafi.Unity.InputControl.KbHandle SetGameSpeedTo3; + public static readonly Mafi.Unity.InputControl.KbHandle SetGameSpeedTo4; + public static readonly Mafi.Unity.InputControl.KbHandle SwitchInHistoryModifier; + public static readonly Mafi.Unity.InputControl.KbHandle SwitchTierModifier; + public static readonly Mafi.Unity.InputControl.KbHandle SwitchToNextInHistory; + public static readonly Mafi.Unity.InputControl.KbHandle SwitchToNextTier; + public static readonly Mafi.Unity.InputControl.KbHandle SwitchToPreviousInHistory; + public static readonly Mafi.Unity.InputControl.KbHandle SwitchToPreviousTier; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleAsteroidsWindow; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleBlueprints; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleBridgesMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleBuildingsMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleCaptainsOffice; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleCargoDocksMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleCloneConfigTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleConsole; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleCopyTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleCutTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleDeleteTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleDumpingTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleFoodMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleForestryMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleHousingMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleInfoOverlays; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleInstaCopyTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleInstaCutTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleLevelingTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleMap; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleMiningTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleOilMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleOrbitWindow; + public static readonly Mafi.Unity.InputControl.KbHandle TogglePasteTool; + public static readonly Mafi.Unity.InputControl.KbHandle TogglePauseTool; + public static readonly Mafi.Unity.InputControl.KbHandle TogglePhotoMode; + public static readonly Mafi.Unity.InputControl.KbHandle TogglePlanningMode; + public static readonly Mafi.Unity.InputControl.KbHandle TogglePowerMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleProductionMenu; + public static readonly Mafi.Unity.InputControl.KbHandle TogglePropsRemovalTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleRecipesBook; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleRecipesPicker; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleResVis; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleResearchWindow; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleSandboxWindow; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleSmeltingMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleStats; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleStoragesMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleSurfacingTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTerraformingMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTerrainInspector; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTowerAreasTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTradePanel; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTrainLinesWindow; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTrainsMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTransportMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTreeHarvestingTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleTutorials; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleUnityTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleUpgradeTool; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleVehiclesManagementWindow; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleVehiclesMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleWasteMenu; + public static readonly Mafi.Unity.InputControl.KbHandle ToggleWaterMenu; + public static readonly Mafi.Unity.InputControl.KbHandle TrainTrackAlternate; + public static readonly Mafi.Unity.InputControl.KbHandle TrainTrackCycleGrade; + public static readonly Mafi.Unity.InputControl.KbHandle TrainTrackCycleRadius; + public static readonly Mafi.Unity.InputControl.KbHandle TrainTrackForceEndAntiClockwise; + public static readonly Mafi.Unity.InputControl.KbHandle TrainTrackForceEndClockwise; + public static readonly Mafi.Unity.InputControl.KbHandle TrainTrackNoTurn; + public static readonly Mafi.Unity.InputControl.KbHandle TrainTrackSelectAll; + public static readonly Mafi.Unity.InputControl.KbHandle TrainTrackSnapping; + public static readonly Mafi.Unity.InputControl.KbHandle TransportNoTurn; + public static readonly Mafi.Unity.InputControl.KbHandle TransportPortsBlocking; + public static readonly Mafi.Unity.InputControl.KbHandle TransportSnapping; + public static readonly Mafi.Unity.InputControl.KbHandle TransportTieBreak; + public static readonly Mafi.Unity.InputControl.KbHandle Undo; + public static readonly Mafi.Unity.InputControl.KbHandle ZoomIn; + public static readonly Mafi.Unity.InputControl.KbHandle ZoomOut; + }
ShortcutsManager class changed public class ShortcutsManager { + public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<UnityEngine.KeyCode> AllKeys; - public bool IsDown(Mafi.Unity.InputControl.KeyBindings bindings); + public bool IsDown(Mafi.Unity.InputControl.KbHandle handle); - public bool IsOn(Mafi.Unity.InputControl.KeyBindings bindings); + public bool IsOn(Mafi.Unity.InputControl.KbHandle handle); - public bool IsUp(Mafi.Unity.InputControl.KeyBindings bindings); + public bool IsUp(Mafi.Unity.InputControl.KbHandle handle); - public string ResolveShortcutToString(string name, System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut = null); - public Mafi.Unity.InputControl.KeyBindings BridgeAlternate { get; } - public Mafi.Unity.InputControl.KeyBindings BridgeForceEndAntiClockwise { get; } - public Mafi.Unity.InputControl.KeyBindings BridgeForceEndClockwise { get; } - public Mafi.Unity.InputControl.KeyBindings BridgeNoTurn { get; } - public Mafi.Unity.InputControl.KeyBindings BridgeSnapping { get; } - public Mafi.Unity.InputControl.KeyBindings CameraLoad1 { get; } - public Mafi.Unity.InputControl.KeyBindings CameraLoad2 { get; } - public Mafi.Unity.InputControl.KeyBindings CameraLoad3 { get; } - public Mafi.Unity.InputControl.KeyBindings CameraSave1 { get; } - public Mafi.Unity.InputControl.KeyBindings CameraSave2 { get; } - public Mafi.Unity.InputControl.KeyBindings CameraSave3 { get; } - public Mafi.Unity.InputControl.KeyBindings ClearDesignation { get; } - public Mafi.Unity.InputControl.KeyBindings CopyExcludingSettings { get; } - public Mafi.Unity.InputControl.KeyBindings DecreaseGameSpeed { get; } - public Mafi.Unity.InputControl.KeyBindings DeleteEntireTransport { get; } - public Mafi.Unity.InputControl.KeyBindings DeleteWithQuickRemove { get; } - public Mafi.Unity.InputControl.KeyBindings DragAdjustSpacing { get; } - public Mafi.Unity.InputControl.KeyBindings DragFillGrid { get; } - public Mafi.Unity.InputControl.KeyBindings DragFreeAngle { get; } - public Mafi.Unity.InputControl.KeyBindings EditorApplyChanges { get; } - public Mafi.Unity.InputControl.KeyBindings ElectrifyWithUnity { get; } - public Mafi.Unity.InputControl.KeyBindings Flip { get; } - public Mafi.Unity.InputControl.KeyBindings FreeLookMode { get; } - public Mafi.Unity.InputControl.KeyBindings IncreaseGameSpeed { get; } - public Mafi.Unity.InputControl.KeyBindings LiftSnapping { get; } - public Mafi.Unity.InputControl.KeyBindings LowerDown { get; } - public Mafi.Unity.InputControl.KeyBindings MoveDown { get; } - public Mafi.Unity.InputControl.KeyBindings MoveLeft { get; } - public Mafi.Unity.InputControl.KeyBindings MoveRight { get; } - public Mafi.Unity.InputControl.KeyBindings MoveUp { get; } - public Mafi.Unity.InputControl.KeyBindings NavigateBack { get; } - public Mafi.Unity.InputControl.KeyBindings NavigateForward { get; } - public Mafi.Unity.InputControl.KeyBindings PanCamera { get; } - public Mafi.Unity.InputControl.KeyBindings PanSpeedBoost { get; } - public Mafi.Unity.InputControl.KeyBindings PauseGame { get; } - public Mafi.Unity.InputControl.KeyBindings PauseMore { get; } - public Mafi.Unity.InputControl.KeyBindings PhotoModeRotation { get; } - public Mafi.Unity.InputControl.KeyBindings PlaceMultiple { get; } - public Mafi.Unity.InputControl.KeyBindings PrimaryAction { get; } - public Mafi.Unity.InputControl.KeyBindings RaiseUp { get; } - public Mafi.Unity.InputControl.KeyBindings Redo { get; } - public Mafi.Unity.InputControl.KeyBindings Rotate { get; } - public Mafi.Unity.InputControl.KeyBindings RotateClockwise { get; } - public Mafi.Unity.InputControl.KeyBindings RotateCounterClockwise { get; } - public Mafi.Unity.InputControl.KeyBindings Search { get; } - public Mafi.Unity.InputControl.KeyBindings SearchOnMap { get; } - public Mafi.Unity.InputControl.KeyBindings SecondaryAction { get; } - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo0 { get; } - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo1 { get; } - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo2 { get; } - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo3 { get; } - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo4 { get; } - public Mafi.Unity.InputControl.KeyBindings SwitchInHistoryModifier { get; } - public Mafi.Unity.InputControl.KeyBindings SwitchTierModifier { get; } - public Mafi.Unity.InputControl.KeyBindings SwitchToNextInHistory { get; } - public Mafi.Unity.InputControl.KeyBindings SwitchToNextTier { get; } - public Mafi.Unity.InputControl.KeyBindings SwitchToPreviousInHistory { get; } - public Mafi.Unity.InputControl.KeyBindings SwitchToPreviousTier { get; } - public Mafi.Unity.InputControl.KeyBindings TakePicture { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleBlueprints { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleCaptainsOffice { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleCloneConfigTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleConsole { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleCopyTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleCutTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleDeleteTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleDumpingTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleInstaCopyTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleInstaCutTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleLevelingTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleMap { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleMiningTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleOrbitWindow { get; } - public Mafi.Unity.InputControl.KeyBindings TogglePasteTool { get; } - public Mafi.Unity.InputControl.KeyBindings TogglePauseTool { get; } - public Mafi.Unity.InputControl.KeyBindings TogglePhotoMode { get; } - public Mafi.Unity.InputControl.KeyBindings TogglePlanningMode { get; } - public Mafi.Unity.InputControl.KeyBindings TogglePropsRemovalTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleRecipeBook { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleRecipesPicker { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleResVis { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleResearchWindow { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleSandboxWindow { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleStats { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleStoragesMenu { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleSurfacingTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTerraformingMenu { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTerrainInspector { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTowerAreasTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTrackElectrificationRemoval { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTradePanel { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTrainLinesWindow { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTrainsMenu { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTransportMenu { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTreeHarvestingTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleTutorials { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleUpgradeTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleUpointsTool { get; } - public Mafi.Unity.InputControl.KeyBindings ToggleVehiclesManagementWindow { get; } - public Mafi.Unity.InputControl.KeyBindings TrainTrackAlternate { get; } - public Mafi.Unity.InputControl.KeyBindings TrainTrackCycleGrade { get; } - public Mafi.Unity.InputControl.KeyBindings TrainTrackCycleRadius { get; } - public Mafi.Unity.InputControl.KeyBindings TrainTrackForceEndAntiClockwise { get; } - public Mafi.Unity.InputControl.KeyBindings TrainTrackForceEndClockwise { get; } - public Mafi.Unity.InputControl.KeyBindings TrainTrackNoTurn { get; } - public Mafi.Unity.InputControl.KeyBindings TrainTrackSelectAll { get; } - public Mafi.Unity.InputControl.KeyBindings TrainTrackSnapping { get; } - public Mafi.Unity.InputControl.KeyBindings TransportNoTurn { get; } - public Mafi.Unity.InputControl.KeyBindings TransportPortsBlocking { get; } - public Mafi.Unity.InputControl.KeyBindings TransportSnapping { get; } - public Mafi.Unity.InputControl.KeyBindings TransportTieBreak { get; } - public Mafi.Unity.InputControl.KeyBindings Undo { get; } - public Mafi.Unity.InputControl.KeyBindings ZoomIn { get; } - public Mafi.Unity.InputControl.KeyBindings ZoomOut { get; } }
ShortcutsMap class removed - public class ShortcutsMap { - public const Mafi.Unity.InputControl.ShortcutMode ANY = Game | MapEditor; - public static readonly Mafi.Collections.ImmutableCollections.ImmutableArray<UnityEngine.KeyCode> AllKeys; - public Mafi.Unity.InputControl.ControllerBinding DroneCameraPitchControllerAxis; - public Mafi.Unity.InputControl.ControllerBinding DroneElevationControllerAxis; - public Mafi.Unity.InputControl.ControllerBinding DroneSpeedControllerAxis; - public Mafi.Unity.InputControl.ControllerBinding DroneStrafeControllerAxis; - public Mafi.Unity.InputControl.ControllerBinding DroneYawControllerAxis; - public const Mafi.Unity.InputControl.ShortcutMode EDITOR = MapEditor; - public const Mafi.Unity.InputControl.ShortcutMode GAME = Game; - public ShortcutsMap(); - public static System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.Reflection.PropertyInfo, Mafi.Unity.InputControl.KbAttribute>> GetKeybindings(Mafi.Unity.InputControl.KbCategory category, Mafi.Unity.IMain main); - public static int GetKeybindingsCount(Mafi.Unity.IMain main); - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.MapEditor, "ApplyChanges", "Apply changes")] - public Mafi.Unity.InputControl.KeyBindings ApplyChanges { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Bridges, "BridgeAlternate", "Toggle snap to grid", null, true)] - public Mafi.Unity.InputControl.KeyBindings BridgeAlternate { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Bridges, "BridgeForceEndAntiClockwise", "Rotate direction anti-clockwise")] - public Mafi.Unity.InputControl.KeyBindings BridgeForceEndAntiClockwise { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Bridges, "BridgeForceEndClockwise", "Rotate direction clockwise")] - public Mafi.Unity.InputControl.KeyBindings BridgeForceEndClockwise { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Bridges, "BridgeNoTurn", "Disallow turns", null, true)] - public Mafi.Unity.InputControl.KeyBindings BridgeNoTurn { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Bridges, "BridgeSnapping", "Toggle snapping")] - public Mafi.Unity.InputControl.KeyBindings BridgeSnapping { get; set; } - public static System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<Mafi.Unity.InputControl.KbCategory, Mafi.Localization.LocStrFormatted>> Categories { get; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Designation, "ClearDesignation", "Clear designation", null, true, true)] - public Mafi.Unity.InputControl.KeyBindings ClearDesignation { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.CopyTool, "CopyExcludingSettings", "Copy without configuration", "Hold while copying structures to exclude copying their configuration", true)] - public Mafi.Unity.InputControl.KeyBindings CopyExcludingSettings { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Speed, "DecreaseGameSpeed", "Decrease speed")] - public Mafi.Unity.InputControl.KeyBindings DecreaseGameSpeed { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Demolish, "DeleteEntireTransport", "Demolish entire transport", null, true)] - public Mafi.Unity.InputControl.KeyBindings DeleteEntireTransport { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Demolish, "DeleteWithQuickRemove", "With quick remove (using Unity)", null, true)] - public Mafi.Unity.InputControl.KeyBindings DeleteWithQuickRemove { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.DragPlacement, "DragAdjustSpacing", "Drag adjust spacing (hold + scroll)", "While drag-placing, hold and scroll to increase or decrease spacing between entities.", true)] - public Mafi.Unity.InputControl.KeyBindings DragAdjustSpacing { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.DragPlacement, "DragFillGrid", "Drag fill grid (hold)", "While drag-placing, hold to fill a rectangular grid instead of a line.", true)] - public Mafi.Unity.InputControl.KeyBindings DragFillGrid { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.DragPlacement, "DragFreeAngle", "Drag free angle (toggle)", "While drag-placing, toggle to disable axis snapping and allow placement at any angle.")] - public Mafi.Unity.InputControl.KeyBindings DragFreeAngle { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.DLC, "ElectrifyWithUnity", "Toggle quick-electrification with Unity", null, true, false, "COI-TrainsDlc")] - public Mafi.Unity.InputControl.KeyBindings ElectrifyWithUnity { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "Flip", "Flip / Toggle mode")] - public Mafi.Unity.InputControl.KeyBindings Flip { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "FreeLookMode", "Free look mode", null, true)] - public Mafi.Unity.InputControl.KeyBindings FreeLookMode { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Speed, "IncreaseGameSpeed", "Increase speed")] - public Mafi.Unity.InputControl.KeyBindings IncreaseGameSpeed { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "JumpToCameraPosition1", "Jump to saved camera position {0}", "1", "")] - public Mafi.Unity.InputControl.KeyBindings JumpToCameraPosition1 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "JumpToCameraPosition2", "Jump to saved camera position {0}", "2", "")] - public Mafi.Unity.InputControl.KeyBindings JumpToCameraPosition2 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "JumpToCameraPosition3", "Jump to saved camera position {0}", "3", "")] - public Mafi.Unity.InputControl.KeyBindings JumpToCameraPosition3 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.General, "KeepTooltipOpen", "Keep tooltip open (hold)", null, true)] - public Mafi.Unity.InputControl.KeyBindings KeepTooltipOpen { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Transport, "LiftSnapping", "Toggle snapping (lifts)")] - public Mafi.Unity.InputControl.KeyBindings LiftSnapping { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "LowerDown", "Lower down")] - public Mafi.Unity.InputControl.KeyBindings LowerDown { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "MoveDown", "Move down")] - public Mafi.Unity.InputControl.KeyBindings MoveDown { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "MoveLeft", "Move left")] - public Mafi.Unity.InputControl.KeyBindings MoveLeft { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "MoveRight", "Move right")] - public Mafi.Unity.InputControl.KeyBindings MoveRight { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "MoveUp", "Move up")] - public Mafi.Unity.InputControl.KeyBindings MoveUp { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.UiNavigation, "NavigateBack", "Navigate back")] - public Mafi.Unity.InputControl.KeyBindings NavigateBack { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.UiNavigation, "NavigateForward", "Navigate forward")] - public Mafi.Unity.InputControl.KeyBindings NavigateForward { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "PanCamera", "Move camera (hold)", null, true)] - public Mafi.Unity.InputControl.KeyBindings PanCamera { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "PanSpeedBoost", "Increase pan speed", null, true)] - public Mafi.Unity.InputControl.KeyBindings PanSpeedBoost { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Speed, "PauseGame", "Toggle pause")] - public Mafi.Unity.InputControl.KeyBindings PauseGame { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.PauseTool, "PauseMore", "Pause only", "Hold to make the pause tool to only pause things instead of automatically toggling pause.", true)] - public Mafi.Unity.InputControl.KeyBindings PauseMore { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.PhotoMode, "PhotoModeRotation", "Camera auto-rotation", null, true)] - public Mafi.Unity.InputControl.KeyBindings PhotoModeRotation { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.PhotoMode, "PhotoModeTakePicture", "Take screenshot", null, true)] - public Mafi.Unity.InputControl.KeyBindings PhotoModeTakePicture { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "PlaceMultiple", "Place multiple", null, true)] - public Mafi.Unity.InputControl.KeyBindings PlaceMultiple { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.General, "PrimaryAction", "Primary action / select", null, false, true)] - public Mafi.Unity.InputControl.KeyBindings PrimaryAction { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "RaiseUp", "Raise up")] - public Mafi.Unity.InputControl.KeyBindings RaiseUp { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.MapEditor, "Redo", "Redo")] - public Mafi.Unity.InputControl.KeyBindings Redo { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "Rotate", "Rotate")] - public Mafi.Unity.InputControl.KeyBindings Rotate { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "RotateClockwise", "Rotate clock-wise")] - public Mafi.Unity.InputControl.KeyBindings RotateClockwise { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "RotateCounterClockwise", "Rotate counter-clock-wise")] - public Mafi.Unity.InputControl.KeyBindings RotateCounterClockwise { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "SaveCameraPosition1", "Save camera position {0}", "1", "")] - public Mafi.Unity.InputControl.KeyBindings SaveCameraPosition1 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "SaveCameraPosition2", "Save camera position {0}", "2", "")] - public Mafi.Unity.InputControl.KeyBindings SaveCameraPosition2 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "SaveCameraPosition3", "Save camera position {0}", "3", "")] - public Mafi.Unity.InputControl.KeyBindings SaveCameraPosition3 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.General, "Search", "Search")] - public Mafi.Unity.InputControl.KeyBindings Search { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.General, "SearchOnMap", "Search on map")] - public Mafi.Unity.InputControl.KeyBindings SearchOnMap { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.General, "SecondaryAction", "Alternative action / deselect", null, false, true)] - public Mafi.Unity.InputControl.KeyBindings SecondaryAction { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Speed, "SetGameSpeedTo0", "Set game speed to {0}x", "0", "")] - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo0 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Speed, "SetGameSpeedTo1", "Set game speed to {0}x", "1", "")] - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo1 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Speed, "SetGameSpeedTo2", "Set game speed to {0}x", "2", "")] - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo2 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Speed, "SetGameSpeedTo3", "Set game speed to {0}x", "3", "")] - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo3 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Speed, "SetGameSpeedTo4", "Set game speed to {0}x", "4", "")] - public Mafi.Unity.InputControl.KeyBindings SetGameSpeedTo4 { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "SwitchInHistoryModifier", "Switch in history + scroll", "When placing a structure, hold the assigned keys and scroll up/down to navigate your placement clipboard history.")] - public Mafi.Unity.InputControl.KeyBindings SwitchInHistoryModifier { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "SwitchTierModifier", "Switch tier + scroll", "When placing a structure or belt/pipe, hold the assigned keys and scroll up/down to switch between tiers.")] - public Mafi.Unity.InputControl.KeyBindings SwitchTierModifier { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "SwitchToNextInHistory", "Switch to next in history")] - public Mafi.Unity.InputControl.KeyBindings SwitchToNextInHistory { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "SwitchToNextTier", "Switch to next tier")] - public Mafi.Unity.InputControl.KeyBindings SwitchToNextTier { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "SwitchToPreviousInHistory", "Switch to previous in history")] - public Mafi.Unity.InputControl.KeyBindings SwitchToPreviousInHistory { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Build, "SwitchToPreviousTier", "Switch to previous tier")] - public Mafi.Unity.InputControl.KeyBindings SwitchToPreviousTier { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleBlueprints", "Blueprints")] - public Mafi.Unity.InputControl.KeyBindings ToggleBlueprints { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleCaptainsOffice", "Captain's office (if constructed)")] - public Mafi.Unity.InputControl.KeyBindings ToggleCaptainsOffice { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleCloneConfigTool", "Clone")] - public Mafi.Unity.InputControl.KeyBindings ToggleCloneConfigTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleConsole", "Console")] - public Mafi.Unity.InputControl.KeyBindings ToggleConsole { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleCopyTool", "Copy")] - public Mafi.Unity.InputControl.KeyBindings ToggleCopyTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleCutTool", "Cut")] - public Mafi.Unity.InputControl.KeyBindings ToggleCutTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleDeleteTool", "Demolish / remove")] - public Mafi.Unity.InputControl.KeyBindings ToggleDeleteTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleDumpingTool", "Dumping designations")] - public Mafi.Unity.InputControl.KeyBindings ToggleDumpingTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleInstaCopyTool", "Copy (insta-copy)", "Will also insta-copy on press while you are hovering over an entity")] - public Mafi.Unity.InputControl.KeyBindings ToggleInstaCopyTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleInstaCutTool", "Cut (insta-cut)", "Will also insta-cut on press while you are hovering over an entity")] - public Mafi.Unity.InputControl.KeyBindings ToggleInstaCutTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleLevelingTool", "Leveling designations")] - public Mafi.Unity.InputControl.KeyBindings ToggleLevelingTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleMap", "World map")] - public Mafi.Unity.InputControl.KeyBindings ToggleMap { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleMiningTool", "Mining designations")] - public Mafi.Unity.InputControl.KeyBindings ToggleMiningTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleOrbitWindow", "Space station screen")] - public Mafi.Unity.InputControl.KeyBindings ToggleOrbitWindow { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "TogglePasteTool", "Paste", "Start placing the last copied selection")] - public Mafi.Unity.InputControl.KeyBindings TogglePasteTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "TogglePauseTool", "Pause tool")] - public Mafi.Unity.InputControl.KeyBindings TogglePauseTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.PhotoMode, "TogglePhotoMode", "Toggle photo mode", "Photo mode allows taking high-quality screenshots (better quality than default screen-grab).")] - public Mafi.Unity.InputControl.KeyBindings TogglePhotoMode { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "TogglePlanningMode", "Toggle planning mode")] - public Mafi.Unity.InputControl.KeyBindings TogglePlanningMode { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "TogglePropsRemovalTool", "Debris removal tool")] - public Mafi.Unity.InputControl.KeyBindings TogglePropsRemovalTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleRecipesBook", "Recipes book")] - public Mafi.Unity.InputControl.KeyBindings ToggleRecipesBook { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleRecipesPicker", "Open recipes selection")] - public Mafi.Unity.InputControl.KeyBindings ToggleRecipesPicker { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleResVis", "Resources visualization")] - public Mafi.Unity.InputControl.KeyBindings ToggleResVis { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleResearchWindow", "Research")] - public Mafi.Unity.InputControl.KeyBindings ToggleResearchWindow { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleSandboxWindow", "Sandbox")] - public Mafi.Unity.InputControl.KeyBindings ToggleSandboxWindow { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleStats", "Statistics")] - public Mafi.Unity.InputControl.KeyBindings ToggleStats { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleStoragesMenu", "Storage menu")] - public Mafi.Unity.InputControl.KeyBindings ToggleStoragesMenu { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleSurfacingTool", "Surface designations")] - public Mafi.Unity.InputControl.KeyBindings ToggleSurfacingTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleTerraformingMenu", "Terraforming menu")] - public Mafi.Unity.InputControl.KeyBindings ToggleTerraformingMenu { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleTerrainInspector", "Terrain inspector")] - public Mafi.Unity.InputControl.KeyBindings ToggleTerrainInspector { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleTowerAreasTool", "Edit tower areas")] - public Mafi.Unity.InputControl.KeyBindings ToggleTowerAreasTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.DLC, "ToggleTrackElectrificationRemoval", "Toggle de-electrification mode", null, true, false, "COI-TrainsDlc")] - public Mafi.Unity.InputControl.KeyBindings ToggleTrackElectrificationRemoval { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleTradePanel", "Trading")] - public Mafi.Unity.InputControl.KeyBindings ToggleTradePanel { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleTrainLinesWindow", "Train lines management")] - public Mafi.Unity.InputControl.KeyBindings ToggleTrainLinesWindow { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleTrainsMenu", "Trains menu")] - public Mafi.Unity.InputControl.KeyBindings ToggleTrainsMenu { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleTransportMenu", "Transports menu")] - public Mafi.Unity.InputControl.KeyBindings ToggleTransportMenu { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleTreeHarvestingTool", "Harvesting designations")] - public Mafi.Unity.InputControl.KeyBindings ToggleTreeHarvestingTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleTutorials", "Tutorials")] - public Mafi.Unity.InputControl.KeyBindings ToggleTutorials { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleUnityTool", "Unity tool")] - public Mafi.Unity.InputControl.KeyBindings ToggleUnityTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Tools, "ToggleUpgradeTool", "Upgrade tool")] - public Mafi.Unity.InputControl.KeyBindings ToggleUpgradeTool { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Windows, "ToggleVehiclesManagementWindow", "Vehicles management")] - public Mafi.Unity.InputControl.KeyBindings ToggleVehiclesManagementWindow { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.TrainTracks, "TrainTrackAlternate", "Use alternative route", null, true)] - public Mafi.Unity.InputControl.KeyBindings TrainTrackAlternate { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.TrainTracks, "TrainTrackCycleGrade", "Cycle max allowed grade")] - public Mafi.Unity.InputControl.KeyBindings TrainTrackCycleGrade { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.TrainTracks, "TrainTrackCycleRadius", "Cycle min allowed radius")] - public Mafi.Unity.InputControl.KeyBindings TrainTrackCycleRadius { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.TrainTracks, "TrainTrackForceEndAntiClockwise", "Rotate direction anti-clockwise")] - public Mafi.Unity.InputControl.KeyBindings TrainTrackForceEndAntiClockwise { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.TrainTracks, "TrainTrackForceEndClockwise", "Rotate direction clockwise")] - public Mafi.Unity.InputControl.KeyBindings TrainTrackForceEndClockwise { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.TrainTracks, "TrainTrackNoTurn", "Disallow turns", null, true)] - public Mafi.Unity.InputControl.KeyBindings TrainTrackNoTurn { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.TrainTracksEdit, "TrainTrackSelectAll", "Toggle train track select all")] - public Mafi.Unity.InputControl.KeyBindings TrainTrackSelectAll { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.TrainTracks, "TrainTrackSnapping", "Toggle snapping")] - public Mafi.Unity.InputControl.KeyBindings TrainTrackSnapping { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Transport, "TransportNoTurn", "Disallow turns", null, true)] - public Mafi.Unity.InputControl.KeyBindings TransportNoTurn { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Transport, "TransportPortsBlocking", "Toggle port avoidance")] - public Mafi.Unity.InputControl.KeyBindings TransportPortsBlocking { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Transport, "TransportSnapping", "Toggle snapping")] - public Mafi.Unity.InputControl.KeyBindings TransportSnapping { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Transport, "TransportTieBreak", "Use alternative route", null, true)] - public Mafi.Unity.InputControl.KeyBindings TransportTieBreak { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.MapEditor, "Undo", "Undo")] - public Mafi.Unity.InputControl.KeyBindings Undo { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "ZoomIn", "Zoom in")] - public Mafi.Unity.InputControl.KeyBindings ZoomIn { get; set; } - [Mafi.Unity.InputControl.KbAttribute(Mafi.Unity.InputControl.KbCategory.Camera, "ZoomOut", "Zoom out")] - public Mafi.Unity.InputControl.KeyBindings ZoomOut { get; set; } - }
ShortcutsRegistry class added + public static class ShortcutsRegistry { + public static event System.Action Changed; + public static string GetOwnerDisplayName(string ownerId); + public static bool TryGet(string id, out Mafi.Unity.InputControl.KbHandle handle); + public static Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Unity.InputControl.KbHandle> All { get; } + public static Mafi.Collections.ReadonlyCollections.IIndexable<Mafi.Unity.InputControl.KbGroup> Groups { get; } + public static int Version { get; } + }
ShortcutsStorage class changed public static class ShortcutsStorage { - public static readonly Mafi.Unity.InputControl.ShortcutsMap Current; - public static readonly Mafi.Unity.InputControl.ShortcutsMap Defaults; - public static int LastVersion; public static void ApplyChanges( + Mafi.Collections.ReadonlyCollections.IIndexable<System.Collections.Generic.KeyValuePair<Mafi.Unity.InputControl.KbHandle, Mafi.Unity.InputControl.KeyBindings>> changes, ); - public static Mafi.Unity.InputControl.KeyBindings FindById(string groupId); - public static System.Collections.Generic.KeyValuePair<System.Reflection.PropertyInfo, Mafi.Unity.InputControl.KbAttribute>[] GetAllAttributes(); - public static void RestoreDefaults(); }
TrainStationStorageAssigner class changed public class TrainStationStorageAssigner { public TrainStationStorageAssigner( Mafi.Unity.IUnityInputMgr inputMgr, Mafi.Core.Input.IInputScheduler inputScheduler, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Unity.InputControl.TerrainCursor terrainCursor, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, Mafi.Unity.Camera.CameraController cameraController, Mafi.Unity.LinesFactory linesFactory, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, Mafi.Unity.InputControl.AssignedBuildingsHighlighter highlighter, Mafi.Core.Trains.TrainStationManager stationManager, Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.CursorMessage> cursorMessage, ); }
UnityInputManager class changed public class UnityInputManager { + public void OpenControlsSettings(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); public void RegisterGlobalShortcut( - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut, + Mafi.Unity.InputControl.KbHandle shortcut, Mafi.Unity.InputControl.IUnityInputController controller, ); public void RegisterGlobalShortcut( - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut, + Mafi.Unity.InputControl.KbHandle shortcut, System.Func<bool> callback, ); }
}
namespace Mafi.Unity.InputControl.AreaTool {
AreaSelectionToolV2 class changed public class AreaSelectionToolV2 { public void SetPrimaryBinding( - Mafi.Unity.InputControl.KeyBindings selectBinding, + Mafi.Unity.InputControl.KbHandle selectBinding, - Mafi.Unity.InputControl.KeyBindings cancelBinding, + Mafi.Unity.InputControl.KbHandle cancelBinding, UnityEngine.Color color, ); }
}
namespace Mafi.Unity.InputControl.GameMenu {
IGameMenuController interface changed public interface IGameMenuController { + void OpenControlsSettings(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); }
}
namespace Mafi.Unity.InputControl.GameMenu.Settings {
AudioTab class changed public class AudioTab { - public AudioTab(); + public AudioTab(Mafi.Option<Mafi.Unity.Audio.Engine.SoundEngine> soundEngine); }
ConfirmDisplaySettingsDialog class changed public class ConfirmDisplaySettingsDialog { public void Show( Mafi.Unity.UiToolkit.Library.IWindowHost host, - Mafi.Duration autoCancelAfter, + Mafi.Localization.LocStrFormatted title, System.Action onCancel, ); }
ControlsTab class changed public class ControlsTab { + public void SetOptions(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); }
ControlsTabOptions struct added + public readonly struct ControlsTabOptions { + public readonly bool ConflictsOnly; + public readonly bool CustomizedOnly; + public readonly Mafi.Option<string> OwnerId; + public readonly string Search; + public ControlsTabOptions(string search = "", Mafi.Option<string> ownerId = default, bool conflictsOnly = false, bool customizedOnly = false); + }
DisplaySwitcher class added + public sealed class DisplaySwitcher { + public DisplaySwitcher(); + public UnityEngine.DisplayInfo GetTargetDisplay(); + public UnityEngine.FullScreenMode GetTargetMode(); + public static UnityEngine.FullScreenMode NormalizeMode(UnityEngine.FullScreenMode mode); + public void SwitchToDisplay(UnityEngine.DisplayInfo display, UnityEngine.FullScreenMode mode); + public void SwitchToDisplayWithConfirmation(UnityEngine.DisplayInfo display, Mafi.Unity.InputControl.GameMenu.Settings.ConfirmDisplaySettingsDialog dialog, Mafi.Unity.UiToolkit.Library.IWindowHost dialogHost, System.Action<UnityEngine.DisplayInfo> onRevert); + public void SwitchToMode(UnityEngine.FullScreenMode mode); + public void SwitchToModeWithConfirmation(UnityEngine.FullScreenMode mode, Mafi.Unity.InputControl.GameMenu.Settings.ConfirmDisplaySettingsDialog dialog, Mafi.Unity.UiToolkit.Library.IWindowHost dialogHost, System.Action<UnityEngine.FullScreenMode> onRevert); + public bool IsSwitching { get; } + }
SettingsWindow class changed public class SettingsWindow { public SettingsWindow( Mafi.Unity.IMain main, Mafi.Unity.InputControl.Messages.ITutorialProgressCleaner progressCleaner, Mafi.Option<Mafi.Unity.InputControl.ShortcutsManager> shortcutsManager, + Mafi.Option<Mafi.Unity.Audio.Engine.SoundEngine> soundEngine, ); + public void ShowControls(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); }
VideoTab class changed public class VideoTab { - public VideoTab(Mafi.Unity.InputControl.GameMenu.Settings.SettingsWindow settingsWindow); + public VideoTab(Mafi.Unity.InputControl.GameMenu.Settings.SettingsWindow settingsWindow, Mafi.Unity.IMain main); }
}
namespace Mafi.Unity.InputControl.Tools {
QuickEntityTransformInputController class changed public class QuickEntityTransformInputController { public QuickEntityTransformInputController( Mafi.Core.Entities.EntitiesManager entitiesManager, Mafi.Core.Input.IInputScheduler inputScheduler, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Unity.InputControl.CursorPickingManager picker, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
}
namespace Mafi.Unity.InstancedRendering.Products {
ProductMeshTable class changed public sealed class ProductMeshTable { + public int GetMixedMemberTexIndex(int mixedMemberTexBase, byte memberIndex); - public Mafi.Unity.InstancedRendering.Products.ProductMeshTable.ProductRenderInfo GetRenderInfo( + public ref readonly Mafi.Unity.InstancedRendering.Products.ProductMeshTable.ProductRenderInfo GetRenderInfo( Mafi.Core.Products.ProductSlimId product, ); public readonly struct ProductRenderInfo { + public readonly int MixedMemberTexBase; public ProductRenderInfo( int lodMeshBase, int texIndex, int shadowMaxLod, bool isLoose, int fusedStack3MeshId, int fusedStack3MinLod, int simplifiedStackingMinLod, bool scaleByQuantity = false, + int mixedMemberTexBase = -1, ); } }
}
namespace Mafi.Unity.MainMenu {
LoadingScreen class changed public class LoadingScreen { public LoadingScreen( Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, Mafi.Core.IFileSystemHelper fsHelper, ); }
MainMenuArgs class changed public class MainMenuArgs { + public readonly Mafi.Unity.MainMenu.Onboarding.OnboardingRequest Onboarding; + public readonly bool OpenSettings; public MainMenuArgs( Mafi.Unity.MainMenu.GameInitFailInfo failInfo = null, + bool openSettings = false, + Mafi.Unity.MainMenu.Onboarding.OnboardingRequest onboarding = default, ); }
}
namespace Mafi.Unity.MainMenu.NewGame {
SelectDifficultyData class changed public class SelectDifficultyData { - public Mafi.Localization.LocStrFormatted Construction; + public Mafi.Localization.LocStr Construction; - public Mafi.Localization.LocStrFormatted Contracts; + public Mafi.Localization.LocStr Contracts; - public Mafi.Localization.LocStrFormatted Description; + public Mafi.Localization.LocStr Description; - public Mafi.Localization.LocStrFormatted Disease; + public Mafi.Localization.LocStr Disease; - public Mafi.Localization.LocStrFormatted Food; + public Mafi.Localization.LocStr Food; - public Mafi.Localization.LocStrFormatted Fuel; + public Mafi.Localization.LocStr Fuel; - public Mafi.Localization.LocStrFormatted Growth; + public Mafi.Localization.LocStr Growth; - public Mafi.Localization.LocStrFormatted Maintenance; + public Mafi.Localization.LocStr Maintenance; - public Mafi.Localization.LocStrFormatted Mining; + public Mafi.Localization.LocStr Mining; - public Mafi.Localization.LocStrFormatted Name; + public Mafi.Localization.LocStr Name; - public Mafi.Localization.LocStrFormatted Pollution; + public Mafi.Localization.LocStr Pollution; - public Mafi.Localization.LocStrFormatted Rain; + public Mafi.Localization.LocStr Rain; - public Mafi.Localization.LocStrFormatted Research; + public Mafi.Localization.LocStr Research; - public Mafi.Localization.LocStrFormatted Unity; + public Mafi.Localization.LocStr Unity; }
}
+ namespace Mafi.Unity.MainMenu.Onboarding {
OnboardingRequest struct added + public readonly struct OnboardingRequest { + public readonly Mafi.Option<UnityEngine.Texture2D> Background; + public readonly bool IsLanguagePicked; + public readonly bool ShowDisplaySelect; + public readonly bool ShowLanguageSelect; + public readonly Mafi.Localization.LocalizationManager.LangInfo? SuggestedLanguage; + public Mafi.Unity.MainMenu.Onboarding.OnboardingRequest AfterLanguagePick(); + public static Mafi.Unity.MainMenu.Onboarding.OnboardingRequest DetectFirstLaunch(string steamGameLanguage, string steamClientLanguage, string systemCultureName, bool force, Mafi.Option<UnityEngine.Texture2D> background); + public static void MarkAsShown(); + public bool IsNeeded { get; } + }
+ }
namespace Mafi.Unity.MapEditor {
MapEditorEscapeMenu class changed public class MapEditorEscapeMenu { public MapEditorEscapeMenu( Mafi.Unity.IMain main, Mafi.Unity.InputControl.Messages.ITutorialProgressCleaner progressCleaner, Mafi.Unity.MapEditor.MapEditor mapEditor, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, ); + public void OpenControlsSettings(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); public class Controller { + public void OpenControlsSettings(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); } }
}
namespace Mafi.Unity.MapEditor.Previews {
EntityTesterPreviewController class changed public class EntityTesterPreviewController { public EntityTesterPreviewController( Mafi.Unity.IUnityInputMgr inputManager, Mafi.NewInstanceOf<Mafi.Unity.InputControl.TerrainCursor> terrainCursor, Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Unity.InputControl.Factory.LayoutEntityPreviewManager previewManager, Mafi.Unity.Camera.CameraController cameraController, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.NewInstanceOf<Mafi.Unity.MapEditor.Previews.EntityTesterToolbox> toolbox, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
}
namespace Mafi.Unity.Particles {
LooseStorageParticlesFactory class removed - [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] - public class LooseStorageParticlesFactory : Mafi.Unity.Particles.IParticlesControllerFactory { - public LooseStorageParticlesFactory(Mafi.Unity.Camera.CameraController cameraController); - public void Remove(Mafi.Unity.Entities.EntityMb entityMb); - public bool TryCreate(Mafi.Unity.Entities.EntityMb entityMb, out Mafi.Unity.Particles.IParticlesController controller); - }
TrainStationModuleParticlesFactory class removed - [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsAllInterfaces)] - public class TrainStationModuleParticlesFactory : Mafi.Unity.Particles.IParticlesControllerFactory { - public TrainStationModuleParticlesFactory(Mafi.Unity.Camera.CameraController cameraController); - public void Remove(Mafi.Unity.Entities.EntityMb entityMb); - public bool TryCreate(Mafi.Unity.Entities.EntityMb entityMb, out Mafi.Unity.Particles.IParticlesController controller); - }
}
namespace Mafi.Unity.Ports.Io {
IoPortsRenderer class changed - [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsEverything)] public class IoPortsRenderer { + : Mafi.Unity.Entities.IEntityPartsInfoOverlayRenderer public IoPortsRenderer( Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Core.Ports.Io.IoPortsManager portsManager, Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.ObjectHighlighter highlighter, Mafi.Core.Ports.Io.PortProductsResolver portProductResolvers, Mafi.Core.Terrain.TerrainOccupancyManager occupancyManager, Mafi.Unity.Utils.IconProvider iconProvider, Mafi.Core.Factory.Transports.ITransportsPredicates transportsPredicates, Mafi.Unity.InstancedRendering.ChunkBasedRenderingManager visibleChunksRenderer, Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Core.Entities.Static.ConstructionManager constructionManager, Mafi.Unity.Utils.ReloadAfterAssetUpdateManager reloadManager, + Mafi.Unity.InfoOverlays.InfoOverlayEntityColors infoOverlayColors, ); + public void SetInfoOverlayColor(Mafi.Core.Entities.IRenderedEntity entity, Mafi.ColorRgba fadeFrom, Mafi.ColorRgba color); }
}
namespace Mafi.Unity.Terrain {
LooseMixedProductsTextureSetter struct changed public readonly struct LooseMixedProductsTextureSetter { - public static int MAX_TEXTURE_COUNT; + public const int MAX_TEXTURE_COUNT = 8; public LooseMixedProductsTextureSetter( UnityEngine.Renderer renderer, - UnityEngine.MaterialPropertyBlock propBlock, + Mafi.Unity.InfoOverlays.InfoOverlaySyncedPropertyBlock propBlock, Mafi.Core.Factory.LoosePileTextureParams pileParams, ); + public void Push(); - public void SetRatios(float ratio0, float ratio1, float ratio2); - public void SetRatios(float ratio0, float ratio1, float ratio2, float ratio3, float ratio4, float ratio5, float ratio6, float ratio7); + public void SetRatios(float[] ratios); + public void SetTextureNoPush(Mafi.Core.Products.LooseProductSlimId slimId, int index); - public void SetUVs(float offset, float scale); }
LooseProductMaterialManager class changed public class LooseProductMaterialManager { + public Mafi.Core.Products.LooseProductSlimId ToLooseSlimId(Mafi.Core.Products.ProductSlimId productId); }
LooseProductMultiTextureSetter struct changed public readonly struct LooseProductMultiTextureSetter { public LooseProductMultiTextureSetter( UnityEngine.Renderer[] renderers, - UnityEngine.MaterialPropertyBlock propBlock, + Mafi.Unity.InfoOverlays.InfoOverlaySyncedPropertyBlock propBlock, Mafi.Core.Factory.LoosePileTextureParams pileParams, ); }
LooseProductTextureSetter struct changed public readonly struct LooseProductTextureSetter { public LooseProductTextureSetter( UnityEngine.Renderer renderer, - UnityEngine.MaterialPropertyBlock propBlock, + Mafi.Unity.InfoOverlays.InfoOverlaySyncedPropertyBlock propBlock, Mafi.Core.Factory.LoosePileTextureParams pileParams, bool useXyForUv, ); }
TerrainRenderer class changed public class TerrainRenderer { public TerrainRenderer( Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Core.Terrain.TerrainOccupancyManager occupancyManager, Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.InstancedRendering.ChunkBasedRenderingManager chunksRenderer, Mafi.Unity.Camera.CameraController cameraController, Mafi.Unity.Utils.ReloadAfterAssetUpdateManager reloadManager, Mafi.Unity.Terrain.TerrainSurfaceTextureManager terrainSurfaceTextureManager, Mafi.Base.Terrain.PostProcessors.ParticleErosionPostProcessor particleErosionPostProcessor, Mafi.Core.Vehicles.VehicleSurfaceProvider vehicleSurfaceProvider, + Mafi.Core.Terrain.Physics.ITerrainDisruptionSimulator disruptionSimulator, ); + public void SetInfoOverlayMaterialNeeded(bool isNeeded); }
}
namespace Mafi.Unity.Trains {
LocomotiveMb class changed public class LocomotiveMb { public void InitializeLocomotive( Mafi.Core.Trains.Locomotive trainCar, Mafi.Unity.Entities.MbBasedEntitiesRenderer renderingManager, Mafi.Core.Trains.LevelCrossingsManager levelCrossingsManager, - Mafi.Unity.Audio.EntityAudioManager audioManager, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, ); }
TrainCarMb class changed public class TrainCarMb { public void InitializeTrainCar( Mafi.Core.Trains.TrainCarBase trainCar, Mafi.Unity.Entities.MbBasedEntitiesRenderer renderingManager, - Mafi.Unity.Audio.EntityAudioManager audioManager, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, ); - protected static bool ShouldCreateSound(Mafi.Core.Entities.SoundSpec spec, bool? prevHasSound, Mafi.Core.Entities.SoundSpec prevSpec); + protected Mafi.Unity.Audio.Engine.SoundEngine Sounds { get; } }
TrainCarMbFactory class changed public class TrainCarMbFactory { public TrainCarMbFactory( Mafi.Unity.Trains.TrainCarModelFactory modelFactory, Mafi.Unity.Entities.MbBasedEntitiesRenderer renderingManager, Mafi.Unity.Terrain.LooseProductMaterialManager looseMaterialManager, Mafi.Core.Trains.LevelCrossingsManager levelCrossingsManager, Mafi.Unity.InstancedRendering.Products.ProductsRenderer productsRenderer, - Mafi.Unity.Audio.EntityAudioManager audioManager, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, Mafi.Core.Prototypes.ProtosDb protosDb, ); }
TrainTrackEntityModelFactory class changed public class TrainTrackEntityModelFactory { public UnityEngine.GameObject CreateBlocksGraphic( Mafi.Core.Trains.IEntityWithTrainTrackBaseProto proto, - bool quarterWidth, ); + public UnityEngine.GameObject CreateHalfWidthBlocksGraphic(Mafi.Core.Trains.IEntityWithTrainTrackBaseProto proto); + public UnityEngine.GameObject CreateQuarterWidthBlocksGraphic(Mafi.Core.Trains.IEntityWithTrainTrackBaseProto proto); }
TrainTrackPillarsRenderer class changed public class TrainTrackPillarsRenderer { + public void SetInfoOverlayColor(Mafi.Core.Entities.IRenderedEntity entity, Mafi.ColorRgba fadeFrom, Mafi.ColorRgba color); }
TrainTracksSpeedVisualizer class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public class TrainTracksSpeedVisualizer : Mafi.Unity.Entities.DelayedEntitiesRenderer, System.IDisposable { + public TrainTracksSpeedVisualizer(Mafi.Unity.Entities.EntitiesRenderingManager entitiesRenderingManager, Mafi.Unity.InstancedRendering.ChunkBasedRenderingManager visibleChunksRenderer, Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.Utils.ReloadAfterAssetUpdateManager reloadManager, Mafi.Unity.Trains.TrainTrackEntityModelFactory modelFactory); + public void Activate(); + public void Deactivate(); + public void Dispose(); + public bool IsActive { get; } + }
}
namespace Mafi.Unity.Ui {
InspectorsManager class changed public class InspectorsManager { public InspectorsManager( Mafi.AllImplementationsOf<Mafi.Core.Mods.IMod> allMods, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.DependencyResolver resolver, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, Mafi.Unity.IUnityInputMgr inputManager, ); }
ProductTypesIcons class changed public static class ProductTypesIcons { + public static Mafi.Collections.ImmutableCollections.ImmutableArray<string> GetIcons(Mafi.Core.Products.ProductType type, bool isRadiationShielded); }
UiContext class changed public class UiContext { - public readonly Mafi.Unity.Audio.AudioDb AudioDb; + public readonly Mafi.Unity.Audio.UiSoundsPlayer UiSounds; public UiContext( Mafi.Unity.Camera.CameraController cameraController, Mafi.Unity.IUnityInputMgr inputMgr, Mafi.Unity.Ui.InspectorsManager inspectorsManager, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, Mafi.Unity.Ports.Io.IoPortsRenderer portsRenderer, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Simulation.ICalendar calendar, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.Core.Input.IInputScheduler inputScheduler, Mafi.Core.Terrain.TerrainManager terrainManager, Mafi.Core.Economy.IAssetTransactionManager assetsManager, Mafi.Core.Population.UpointsManager upointsManager, Mafi.Core.Factory.MechanicalPower.IShaftManager shaftManager, Mafi.Core.Entities.Priorities.GlobalPrioritiesManager prioritiesManager, Mafi.Core.Terrain.Designation.UnreachableTerrainDesignationsManager unreachablesManager, Mafi.Core.Entities.Static.UpgradesManager upgradesManager, Mafi.Core.Vehicles.ILogisticsZonesManager logisticsZonesManager, Mafi.Unity.Vehicles.LogisticsZonesRenderer logisticsZonesRenderer, Mafi.Core.Terrain.TerrainSurfaceManager terrainSurfaceManager, Mafi.Unity.Terrain.TerrainRenderer terrainRenderer, Mafi.Core.Terrain.Designation.SurfaceDesignationsManager surfaceDesignationsManager, Mafi.Unity.Terrain.Designation.SurfaceDesignationsRenderer surfaceDesignationsRenderer, Mafi.Unity.Terrain.Designation.TerrainDesignationsRenderer terrainDesignationsRenderer, Mafi.Unity.Entities.MbBasedEntitiesRenderer entitiesRenderer, Mafi.Core.Terrain.Designation.UnreachableTerrainDesignationsManager unreachableDesignationsManager, Mafi.Unity.InputControl.UnlockedProtosDbForUi unlockedProtosDbForUi, Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Core.PropertiesDb.IPropertiesDb propsDb, Mafi.Unity.UiToolkit.UiRoot uiRoot, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, Mafi.Unity.Ui.ProtoPopups.ProtoPopupProvider protoPopupProvider, Mafi.NewInstanceOf<Mafi.Unity.Ui.ProtoPopups.ProtoPopup> inspectorsPopup, Mafi.Core.Notifications.INotificationsManager notificationsManager, Mafi.LazyResolve<Mafi.Unity.Ui.MessagesWindow.Controller> messagesCenter, Mafi.Core.Maintenance.MaintenanceManager maintenanceManager, Mafi.Core.Vehicles.VehiclesManager vehiclesManager, Mafi.Unity.UiStatic.Inspectors.Vehicles.VehiclesReplacementMap vehiclesReplacementMap, Mafi.Unity.Vehicles.ShipsPathabilityOverlayRenderer shipsPathabilityOverlayRenderer, Mafi.Unity.Vehicles.VehiclesPathabilityOverlayRenderer vehiclesPathabilityOverlayRenderer, Mafi.LazyResolve<Mafi.Unity.Ui.Controllers.Vehicles.VehiclesGoToController> vehiclesGoToController, Mafi.Core.Trains.TrainsManager trainsManager, Mafi.Core.Trains.TrainLinesManager trainsLinesManager, Mafi.Core.Trains.TrainNetworksManager trainsNetworksManager, Mafi.Unity.Ui.Controllers.Trains.TrainPathPicker trainPathPicker, Mafi.Unity.Ui.Controllers.Trains.TrainPathVisualizer trainPathVisualizer, Mafi.Unity.Trains.TrainTracksBlockVisualizer trainTracksBlockVisualizer, Mafi.Unity.InputControl.Inspectors.Buildings.OceanAreasOverlayRenderer oceanOverlayRenderer, Mafi.Unity.LinesFactory linesFactory, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Unity.InputControl.TerrainCursor terrainCursor, Mafi.Unity.InputControl.CursorPickingManager cursorPickingManager, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, Mafi.Core.Game.GameDifficultyConfig gameDifficultyConfig, Mafi.Core.SandboxManager sandboxManager, ); }
}
namespace Mafi.Unity.Ui.Controllers {
TransportBuildController class changed public class TransportBuildController { public TransportBuildController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.NewInstanceOf<Mafi.Unity.InputControl.TerrainCursor> terrainCursor, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Unity.Ports.Io.IoPortsRenderer portsRenderer, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, Mafi.Unity.Ui.Controllers.PathFindingTransportPreview transportPreview, Mafi.Core.Prototypes.UnlockedProtosDb unlockedProtosDb, Mafi.Unity.InputControl.TerrainCursorVisual terrainCursorVisual, Mafi.Unity.Mine.TowerAreasRenderer towerAreasRenderer, Mafi.Core.UiState.LastSelectedTierTracker lastSelectedTierTracker, + Mafi.Core.Audio.SoundBindingsTable soundBindings, ); }
TransportPillarBuildController class changed public class TransportPillarBuildController { public TransportPillarBuildController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Core.Factory.Transports.TransportsManager transportsManager, Mafi.Core.Factory.Transports.TransportsConstructionHelper constructionHelper, Mafi.Unity.Factory.Transports.TransportPillarsRenderer pillarsRenderer, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
TreeHarvestingDesignatorController class changed public class TreeHarvestingDesignatorController { public TreeHarvestingDesignatorController( Mafi.Unity.Ui.Hud.ToolbarHud hud, Mafi.Unity.IUnityInputMgr inputManager, Mafi.Core.Terrain.Trees.TreesManager treeManager, Mafi.Unity.Terrain.TreesRenderer treesRenderer, Mafi.Unity.Trees.TreeHarvestingHighlightManager treesHighlightManager, Mafi.Unity.Vehicles.LogisticsZonesRenderer logisticsZonesRenderer, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Unity.InputControl.AreaTool.AreaSelectionToolFactory areaSelectionToolFactory, Mafi.NewInstanceOf<Mafi.Unity.Terrain.TerrainAreaOutlineRenderer> terrainOutlineRenderer, Mafi.Core.Input.InputScheduler inputScheduler, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
}
namespace Mafi.Unity.Ui.Controllers.Bridges {
BridgeBuildController class changed public class BridgeBuildController { public BridgeBuildController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.NewInstanceOf<Mafi.Unity.InputControl.TerrainCursor> terrainCursor, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Unity.Ports.Io.IoPortsRenderer portsRenderer, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, Mafi.Unity.Ui.Controllers.Bridges.PathFindingBridgePreview bridgePreview, Mafi.Unity.InputControl.TerrainCursorVisual terrainCursorVisual, Mafi.Core.Terrain.TerrainOccupancyManager occupancyManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.Core.Entities.EntitiesCloneConfigHelper cloneConfigHelper, Mafi.Unity.InputControl.Inspectors.Buildings.OceanAreasOverlayRenderer oceanOverlayRenderer, Mafi.Unity.Terrain.TerrainRenderer terrainRenderer, ); }
}
namespace Mafi.Unity.Ui.Controllers.Designations {
TerrainDesignationController class changed public abstract class TerrainDesignationController { public TerrainDesignationController( Mafi.Unity.Ui.UiContext context, Mafi.Unity.InputControl.TerrainCursor terrainCursor, Mafi.Unity.Terrain.Designation.TerrainDesignationsRenderer renderer, Mafi.Unity.Mine.TowerAreasRenderer towerAreasRenderer, Mafi.Unity.Vehicles.LogisticsZonesRenderer logisticsZonesRenderer, Mafi.Core.Terrain.Designation.TerrainDesignationsManager manager, Mafi.Unity.Ui.Controllers.Designations.IAreaToolbox toolbox, Mafi.Unity.UiStatic.Controllers.DesignationControllerCursors cursors, Mafi.Unity.Ui.Library.CursorMessage cursorMessage, Mafi.NewInstanceOf<Mafi.Unity.Terrain.TerrainAreaOutlineRenderer> terrainOutlineRenderer, Mafi.Core.Terrain.Designation.ITerrainDesignationsManager designationManager, Mafi.Core.Terrain.Designation.TerrainDesignationProto designationProto, Mafi.Unity.InputControl.Inspectors.Buildings.OceanAreasOverlayRenderer oceanOverlayRenderer, - UnityEngine.AudioSource applySound, + Mafi.Unity.Audio.UiSound applySound, bool isForestry, ); }
}
namespace Mafi.Unity.Ui.Controllers.LayoutEntityPlacing {
LayoutEntityToolbox class changed public class LayoutEntityToolbox { public LayoutEntityToolbox( Mafi.Unity.Ui.Hud.ToolbarHud hud, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
}
namespace Mafi.Unity.Ui.Controllers.Roads {
ModularVehicleRampBuildController class changed public class ModularVehicleRampBuildController { public ModularVehicleRampBuildController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.NewInstanceOf<Mafi.Unity.InputControl.TerrainCursor> terrainCursor, Mafi.Unity.InputControl.Factory.LayoutEntityPreviewManager previewManager, Mafi.Core.Entities.ConfigSerializationContext configContext, Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.CursorMessage> cursorMessage, Mafi.Unity.Ui.Controllers.LayoutEntityPlacing.EntityMassPlacerHistoryController historyController, Mafi.Core.Roads.RoadsManager roadsManager, Mafi.Unity.LinesFactory linesFactory, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
}
namespace Mafi.Unity.Ui.Controllers.Tools {
BaseEntityCursorInputController<T> class changed public abstract class BaseEntityCursorInputController<T> { protected BaseEntityCursorInputController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Unity.InputControl.CursorPickingManager cursorPickingManager, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, Mafi.Unity.InputControl.AreaTool.AreaSelectionToolFactory areaSelectionToolFactory, Mafi.NewInstanceOf<Mafi.Unity.Terrain.TerrainAreaOutlineRenderer> terrainOutlineRenderer, Mafi.Core.Entities.IEntitiesManager entitiesManager, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, Mafi.Option<Mafi.NewInstanceOf<Mafi.Unity.InputControl.Factory.TransportTrajectoryHighlighter>> transportTrajectoryHighlighter, Mafi.Core.Prototypes.Proto.ID? lockByProto, Mafi.Unity.UiStatic.CursorStyle? cursorStyle, - string successSound, + Mafi.Unity.Audio.UiSound successSound, Mafi.Option<Mafi.Unity.Ui.Controllers.Tools.FilterToolbox> filterToolbox, ); }
DeleteEntityInputController class changed public class DeleteEntityInputController { public DeleteEntityInputController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Unity.InputControl.CursorPickingManager cursorPickingManager, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.DockedSellPricePopup> pricePopup, Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.CursorMessage> cursorMessage, Mafi.Unity.Ui.Controllers.Tools.TreeRemovalHandler treeRemovalHandler, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, ); }
FulfillDesignationsInputController class changed public class FulfillDesignationsInputController { public FulfillDesignationsInputController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Unity.InputControl.AreaTool.AreaSelectionToolFactory areaSelectionToolFactory, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, Mafi.NewInstanceOf<Mafi.Unity.Terrain.TerrainAreaOutlineRenderer> terrainOutlineRenderer, Mafi.Unity.Ui.SandboxWindow.Controller sandboxWindowController, ); }
}
namespace Mafi.Unity.Ui.Controllers.Trains {
ITrackReplacingBuildController interface added + public interface ITrackReplacingBuildController : Mafi.Unity.InputControl.IUnityInputController { + bool IsToolFor(Mafi.Core.Entities.Static.StaticEntityProto proto); + bool IsActive { get; } + }
TrackReplacingBuildControllerBase<TProto> class added + public abstract class TrackReplacingBuildControllerBase<TProto> : Mafi.Unity.IHotReloadUi, Mafi.Unity.InputControl.IUnityInputController, Mafi.Unity.Ui.Controllers.Trains.ITrackReplacingBuildController where TProto : Mafi.Core.Trains.TrackReplacingEntityBaseProto { + protected TrackReplacingBuildControllerBase(Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.Unity.InputControl.Factory.LayoutEntityPreviewManager previewManager, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, Mafi.Core.Entities.EntitiesCloneConfigHelper configCloneHelper, Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.CursorMessage> cursorMessage, bool showValidationErrors = false); + public void Activate(); + public void Deactivate(); + public void DisposeForHotReload(); + protected abstract void EvaluateTrack(Mafi.Core.Trains.TrainTrack track, out Mafi.Option<TProto> proto, out Mafi.Localization.LocStr? error); + public bool InputUpdate(); + protected abstract bool IsPlacedEntity(Mafi.Core.Entities.Static.IStaticEntity entity); + public bool IsToolFor(Mafi.Core.Entities.Static.StaticEntityProto proto); + protected virtual TProto SelectPreviewProto(Mafi.Core.Trains.TrainTrack track, TProto proto); + public Mafi.Unity.InputControl.ControllerConfig Config { get; } + public bool IsActive { get; } + }
TrainPathPicker class changed public class TrainPathPicker { public TrainPathPicker( Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.NewInstanceOf<Mafi.Core.Trains.TrainsPathFinder> trainsPathFinder, Mafi.Core.Trains.TrainsPathFinderConfig pathfinderConfig, + Mafi.Core.Trains.TrainWaypointRestrictionsRegistry restrictionsRegistry, Mafi.NewInstanceOf<Mafi.Unity.Ui.Controllers.Trains.TrainSinglePathVisualizer> pathVisualizer, Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.CursorMessage> cursorMessage, ); }
TrainStationWaypointStationBuildController class changed public class TrainStationWaypointStationBuildController { + : Mafi.Unity.Ui.Controllers.Trains.TrackReplacingBuildControllerBase<Mafi.Core.Trains.TrainStationWaypointBaseProto> public TrainStationWaypointStationBuildController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, - Mafi.Unity.InputControl.CursorPickingManager picker, - Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.Unity.InputControl.Factory.LayoutEntityPreviewManager previewManager, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, Mafi.Core.Entities.EntitiesCloneConfigHelper configCloneHelper, - Mafi.Core.Prototypes.ProtosDb protosDb, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.CursorMessage> cursorMessage, ); - public void Activate(); - public void Deactivate(); - public void DisposeForHotReload(); - public bool InputUpdate(); - public Mafi.Unity.InputControl.ControllerConfig Config { get; } - public bool IsActive { get; } }
TrainTrackAddSuperBlockController class changed public class TrainTrackAddSuperBlockController { public TrainTrackAddSuperBlockController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, - Mafi.Unity.Audio.AudioDb audioDb, ); }
TrainTrackBlockRegionController class changed public class TrainTrackBlockRegionController { public TrainTrackBlockRegionController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, - Mafi.Unity.Audio.AudioDb audioDb, ); }
TrainTrackBufferBuildController class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public class TrainTrackBufferBuildController : Mafi.Unity.Ui.Controllers.Trains.TrackReplacingBuildControllerBase<Mafi.Core.Trains.TrainTrackBufferBaseProto> { + public TrainTrackBufferBuildController(Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.Unity.InputControl.Factory.LayoutEntityPreviewManager previewManager, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, Mafi.Core.Entities.EntitiesCloneConfigHelper configCloneHelper, Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.CursorMessage> cursorMessage); + }
TrainTrackBuildController class changed public class TrainTrackBuildController { public TrainTrackBuildController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.NewInstanceOf<Mafi.Unity.InputControl.TerrainCursor> terrainCursor, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Unity.Ports.Io.IoPortsRenderer portsRenderer, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Unity.UiStatic.Cursors.CursorManager cursorManager, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, Mafi.Unity.Ui.Controllers.Trains.PathFindingTrainTrackPreview trackPreview, Mafi.Unity.InputControl.TerrainCursorVisual terrainCursorVisual, Mafi.Core.Terrain.TerrainOccupancyManager occupancyManager, Mafi.Unity.Mine.TowerAreasRenderer towerAreasRenderer, Mafi.Core.Entities.EntitiesCloneConfigHelper cloneConfigHelper, Mafi.Core.Trains.TrainTracksGraphManager graphManager, ); }
TrainTrackDirectionController class changed public class TrainTrackDirectionController { public TrainTrackDirectionController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, Mafi.NewInstanceOf<Mafi.Unity.Ui.Library.CursorMessage> cursorMessage, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
TrainTrackPillarBuildController class changed public class TrainTrackPillarBuildController { public TrainTrackPillarBuildController( Mafi.Unity.Ui.Hud.ToolbarHud toolbar, Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.Unity.Trains.TrainTrackPillarsRenderer pillarsRenderer, Mafi.Core.Trains.TrainTracksPillarManager pillarManager, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.UiSoundsPlayer uiSounds, ); }
TrainTrackRegionSelectController class changed public abstract class TrainTrackRegionSelectController { public TrainTrackRegionSelectController( Mafi.Unity.Ui.UiContext context, Mafi.Core.Simulation.ISimLoopEvents simLoopEvents, Mafi.Unity.InputControl.CursorPickingManager picker, Mafi.Core.Trains.TrainTracksGraphManager trainTracksGraphManager, Mafi.Unity.Trains.TrackDirectionRenderer trackDirectionRenderer, Mafi.Option<Mafi.Unity.Ui.Controllers.Trains.TrainTrackRegionToolbox> toolbox, Mafi.NewInstanceOf<Mafi.Unity.Entities.EntityHighlighter> highlighter, - Mafi.Unity.Audio.AudioDb audioDb, ); }
}
namespace Mafi.Unity.Ui.GameMenu {
GameEscapeMenu class changed public class GameEscapeMenu { public GameEscapeMenu( Mafi.Unity.Ui.GameMenu.GameEscapeMenu.Controller controller, Mafi.Unity.IMain main, Mafi.Core.SaveGame.ISaveManager saveManager, Mafi.Core.SaveGame.IGameSaveInfoProvider gameSaveInfoProvider, Mafi.Unity.InputControl.Messages.ITutorialProgressCleaner progressCleaner, Mafi.Core.Game.GameDifficultyApplier difficultyApplier, Mafi.Core.Input.IInputScheduler inputScheduler, Mafi.Core.RandomProvider randomProvider, Mafi.Unity.InputControl.ShortcutsManager shortcutsManager, Mafi.Unity.IUnityInputMgr inputMgr, Mafi.Unity.UiToolkit.UiRoot uiRoot, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, ); + public void OpenControlsSettings(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); public class Controller { + public void OpenControlsSettings(Mafi.Unity.InputControl.GameMenu.Settings.ControlsTabOptions options); } }
PromoCodeRedeemerForUi class added + [Mafi.GlobalDependencyAttribute(Mafi.RegistrationMode.AsSelf)] + public class PromoCodeRedeemerForUi { + public event System.Action OnRewardsChanged; + public PromoCodeRedeemerForUi(Mafi.Core.PromoCode.PromoCodeManager promoCodeManager, Mafi.Core.Entities.EntitiesManager entitiesManager, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents); + public void Redeem(string code, System.Action<Mafi.Core.PromoCode.RedeemResult> onDone); + public void RequestRewardsRefresh(); + public bool IsAvailable { get; } + public bool IsRedeeming { get; } + public Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Unity.Ui.GameMenu.PromoCodeRedeemerForUi.RewardStatus> Rewards { get; } + public readonly struct RewardStatus { + public readonly int Limit; + public readonly int PlacedCount; + public readonly Mafi.Core.Prototypes.Proto Proto; + public RewardStatus(Mafi.Core.Prototypes.Proto proto, int placedCount, int limit); + } + }
PromoCodeWindow class added + public class PromoCodeWindow : Mafi.Unity.UiToolkit.Library.Window { + public PromoCodeWindow(Mafi.Unity.Ui.GameMenu.PromoCodeRedeemerForUi redeemer); + }
}
namespace Mafi.Unity.Ui.Hud {
CalendarControlsHud class changed public class CalendarControlsHud { + public static string FormatClockTime(Mafi.Unity.RealTimeClockMode mode, System.DateTime time); }
ToolbarHud class changed public class ToolbarHud { public Mafi.Unity.UiToolkit.Library.Button AddMainMenuButton( Mafi.Localization.LocStrFormatted name, Mafi.Unity.UiStatic.Toolbar.IToolbarItemController controller, string iconAssetPath, float order, - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut = null, + Mafi.Option<Mafi.Unity.InputControl.KbHandle> shortcut = default, ); public Mafi.Unity.UiToolkit.Library.Button AddToolButton( Mafi.Localization.LocStrFormatted name, Mafi.Unity.UiStatic.Toolbar.IToolbarItemController controller, string iconAssetPath, float order, - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut = null, + Mafi.Option<Mafi.Unity.InputControl.KbHandle> shortcut = default, Mafi.Core.Prototypes.Proto.ID? tutorialId = null, ); }
Toolbox class changed public class Toolbox { public Mafi.Unity.Ui.Hud.ToolboxItem AddEntry( Mafi.Localization.LocStrFormatted text, - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut, + Mafi.Unity.InputControl.KbHandle shortcut, System.Action onClick = null, Mafi.Localization.LocStrFormatted? tooltip = null, ); public Mafi.Unity.Ui.Hud.ToolboxItem AddEntry( string iconAssetPath, - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut, + Mafi.Unity.InputControl.KbHandle shortcut, System.Action onClick = null, Mafi.Localization.LocStrFormatted? tooltip = null, ); + public Mafi.Unity.Ui.Hud.ToolboxItem AddEntry(string iconAssetPath, Mafi.Unity.InputControl.KeyBindings keys, System.Action onClick = null, Mafi.Localization.LocStrFormatted? tooltip = null); }
ToolboxItem class changed public class ToolboxItem { public ToolboxItem( - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> getBindings, + System.Func<Mafi.Unity.InputControl.KeyBindings> getBindings, Mafi.Localization.LocStrFormatted text, System.Action onClick = null, ); public ToolboxItem( - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> getBindings, + System.Func<Mafi.Unity.InputControl.KeyBindings> getBindings, string iconPath, System.Action onClick = null, ); - public Mafi.Unity.Ui.Hud.ToolboxItem Update(Mafi.Unity.InputControl.ShortcutsManager manager); + public Mafi.Unity.Ui.Hud.ToolboxItem Update(); }
}
namespace Mafi.Unity.Ui.Hud.Search {
GlobalSearchTask class changed public class GlobalSearchTask { - public const int MIN_CHARS = 2; + public const int MIN_CHARS = 1; }
}
namespace Mafi.Unity.Ui.Hud.Toolbar {
LeftToolbarOrder class changed public static class LeftToolbarOrder { + public const int INFO_OVERLAYS = 15; }
}
namespace Mafi.Unity.Ui.Hud.Toolbar.MenuItems {
ControllerToolbarMenuItem class changed public class ControllerToolbarMenuItem { public ControllerToolbarMenuItem( Mafi.Unity.Ui.UiContext context, Mafi.Unity.InputControl.IUnityInputController controller, Mafi.Localization.LocStrFormatted name, string iconPath, Mafi.Collections.ImmutableCollections.ImmutableArray<Mafi.Core.Entities.Static.Layout.ToolbarEntryData> categories, Mafi.Core.Prototypes.Proto extraLockingProto = null, Mafi.Core.Prototypes.Proto groupProto = null, Mafi.Core.Prototypes.Proto popupProto = null, Mafi.Localization.LocStrFormatted? floaterTitle = null, Mafi.Localization.LocStrFormatted? floaterDesc = null, - System.Func<Mafi.Unity.InputControl.ShortcutsManager, Mafi.Unity.InputControl.KeyBindings> shortcut = null, + Mafi.Option<Mafi.Unity.InputControl.KbHandle> shortcut = default, Mafi.Core.Prototypes.Proto.ID? tutorialId = null, int? order = null, System.Action<Mafi.Unity.InputControl.IUnityInputController> onControllerToBeActivated = null, ); }
}
namespace Mafi.Unity.Ui.Hud.Toolbar.MenuItems.Registrators {
TrainTracksToolbarRegistrator class changed public class TrainTracksToolbarRegistrator { public TrainTracksToolbarRegistrator( Mafi.Unity.Ui.Hud.ToolbarHud hud, Mafi.Unity.Ui.UiContext context, Mafi.Unity.Ui.Controllers.Trains.TrainTrackDirectionController trainTrackDirectionController, Mafi.Unity.Ui.Controllers.Trains.TrainTrackBlockRegionController trainTrackBlockRegionController, Mafi.Unity.Ui.Controllers.Trains.TrainTrackAddSuperBlockController trainTrackAddSuperBlockController, Mafi.Unity.Ui.Controllers.Trains.TrainTrackPillarBuildController trainTrackPillarBuildController, Mafi.Unity.Ui.Controllers.Trains.TrainStationWaypointStationBuildController waypointStationBuildController, + Mafi.Unity.Ui.Controllers.Trains.TrainTrackBufferBuildController trackBufferBuildController, Mafi.Unity.Ui.Controllers.Trains.TrainTrackBuildController trainTrackBuilderController, ); }
}
namespace Mafi.Unity.Ui.Inspectors {
BillboardColorPresetBtn class changed public class BillboardColorPresetBtn { public BillboardColorPresetBtn( Mafi.ColorRgba primary, Mafi.ColorRgba secondary, + bool softenColors, System.Action onClick, ); }
RocketLaunchPadInspector class changed public class RocketLaunchPadInspector { public class BufferUi { public Mafi.Unity.Ui.Inspectors.RocketLaunchPadInspector.BufferUi Value( - Mafi.Core.Entities.Static.ProductBuffer buffer, + Mafi.Core.Entities.Static.IPlainProductBuffer buffer, Mafi.Core.Buildings.SpaceProgram.RocketLaunchPad launchPad, ); } }
TrainDepotInspector class changed public class TrainDepotInspector { public TrainDepotInspector( Mafi.Unity.Ui.UiContext context, Mafi.Core.Trains.TrainLinesManager trainLinesManager, Mafi.Core.Trains.TrainNetworksManager trainNetworksManager, Mafi.Unity.Ui.Trains.TrainLinesManagerWindow.Controller trainLinesController, Mafi.Unity.Trains.TrainTracksPathabilityVisualizer trainTracksPathabilityVisualizer, + Mafi.Unity.Trains.TrainTracksSpeedVisualizer speedVisualizer, Mafi.Unity.Ui.Trains.TrainDesignerWindow.Controller trainDesigner, Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, ); }
TrainInspector class changed public class TrainInspector { public TrainInspector( Mafi.Unity.Ui.UiContext context, Mafi.Core.Trains.TrainLinesManager trainLinesManager, Mafi.Core.Trains.TrainNetworksManager trainNetworksManager, Mafi.Core.Trains.TrainsManager trainsManager, Mafi.Unity.Ui.Trains.TrainDesignerWindow.Controller trainDesigner, Mafi.Unity.Ui.Trains.TrainLinesManagerWindow.Controller trainLinesController, + Mafi.Unity.Trains.TrainTracksSpeedVisualizer speedVisualizer, Mafi.NewInstanceOf<Mafi.Unity.Ui.Controllers.Trains.TrainGoToController> trainGoToController, ); }
TrainTrackBufferInspector class added + public class TrainTrackBufferInspector : Mafi.Unity.Ui.Library.Inspectors.BaseInspector<Mafi.Base.Prototypes.Trains.TrainTrackBuffer> { + public TrainTrackBufferInspector(Mafi.Unity.Ui.UiContext context); + }
}
namespace Mafi.Unity.Ui.Inspectors.Trains {
WagonWithCargoUi class changed public class WagonWithCargoUi { public struct CarGroupData { + public Mafi.Core.Trains.Train Train; - public CarGroupData(Mafi.Core.Trains.CargoWagon wagon, bool isFlipped, Mafi.Core.TrainId trainId); + public CarGroupData(Mafi.Core.Trains.CargoWagon wagon, bool isFlipped, Mafi.Core.Trains.Train train); } public struct SubCarData { + public Mafi.Unity.Ui.Inspectors.Trains.WagonWithCargoUi.SubCarData MergedWith(Mafi.Unity.Ui.Inspectors.Trains.WagonWithCargoUi.SubCarData other); } }
}
namespace Mafi.Unity.Ui.Inspectors.WorldMap {
WorldMapEntityRepairPanel class changed public static class WorldMapEntityRepairPanel { public static Mafi.Unity.UiToolkit.Library.Panel AddRepairPanel<T>( this Mafi.Unity.Ui.Library.Inspectors.BaseInspector<T> inspector, - ) where T : Mafi.Core.World.Entities.IUpgradableWorldEntity, Mafi.Core.World.Entities.WorldMapRepairableEntity; + ) where T : Mafi.Core.World.Entities.WorldMapRepairableEntity, Mafi.Core.World.Entities.IUpgradableWorldEntity; }
}
namespace Mafi.Unity.Ui.Library {
Display class changed public class Display { + public Mafi.Unity.Ui.Library.Display FixedDigits(int digits); }
KeyBindUi class changed public class KeyBindUi { + public Mafi.Unity.Ui.Library.KeyBindUi SetKeys(Mafi.Unity.InputControl.KbHandle kbHandle); }
ProductBufferUi class changed public class ProductBufferUi { + public Mafi.Unity.Ui.Library.ProductBufferUi HideCapacityAndPercent(); }
ProductQuantityUiWithRemove class changed public class ProductQuantityUiWithRemove { + public Mafi.Unity.Ui.Library.ProductQuantityUiWithRemove WithFloater(System.Func<Mafi.Core.Products.ProductProto, Mafi.Option<Mafi.Unity.UiToolkit.Component.UiComponent>> factory); }
ProtoIconWithRemove class changed public class ProtoIconWithRemove { + public static readonly Mafi.Px EXPECTED_HEIGHT_COMPACT; + public Mafi.Unity.Ui.Library.ProtoIconWithRemove WithFloater(System.Func<Mafi.Core.Products.ProductProto, Mafi.Option<Mafi.Unity.UiToolkit.Component.UiComponent>> factory); }
RecipeUi class changed public class RecipeUi { public class DynamicProductUi { + public void AttachProductBreakdown(System.Action<Mafi.Collections.Lyst<Mafi.Core.ProductQuantity>> getBreakdown); + public Mafi.Unity.Ui.Library.RecipeUi.DynamicProductUi MarkApproximate(); } public class StaticProductUi { public StaticProductUi( Mafi.Unity.Ui.Library.RecipeUi recipeUi, Mafi.Core.Products.ProductProto product, Mafi.Fix64 recipeQuantity, + bool isApproximate = false, ); } }
SingleProductPickerUi class changed public class SingleProductPickerUi { + public Mafi.Unity.Ui.Library.SingleProductPickerUi SuppressIconTooltip(); + public Mafi.Unity.UiToolkit.Library.Icon ProductIcon { get; } }
StaticRecipeUi class changed public class StaticRecipeUi { public StaticRecipeUi( Mafi.Core.Factory.Recipes.IRecipeForUi recipe, System.Action<Mafi.Core.Products.ProductProto> onProductClick = null, bool showPlusIcons = true, System.Action<Mafi.Unity.UiToolkit.Library.ButtonIcon> customizeCustomOutputIcon = null, bool showQuantities = true, + Mafi.Core.Products.IProductsManager productsManager = null, ); }
}
namespace Mafi.Unity.Ui.Library.Inspectors {
BufferWithMultipleProductsUi class changed public class BufferWithMultipleProductsUi { + public Mafi.Unity.Ui.Library.Inspectors.BufferWithMultipleProductsUi HideNumbers(); + public Mafi.Unity.Ui.Library.Inspectors.BufferWithMultipleProductsUi SetProductFloaterFactory(System.Func<Mafi.Core.Products.ProductProto, Mafi.Option<Mafi.Unity.UiToolkit.Component.UiComponent>> factory); }
ProductBreakdownPanelHelper class added + public static class ProductBreakdownPanelHelper { + public static void AddProductBreakdownBar<T>(this Mafi.Unity.Ui.Library.Inspectors.BaseInspector<T> inspector, Mafi.Unity.UiToolkit.Library.PanelWithHeader panel, System.Func<bool> isMixedProduct, System.Action<Mafi.Collections.Lyst<Mafi.Core.ProductQuantity>> getBreakdown, System.Func<Mafi.Quantity> getCapacity) where T : class, Mafi.Core.Entities.IEntity; + public static void AttachLegendBreakdownFloaters<T>(this Mafi.Unity.Ui.Library.Inspectors.BaseInspector<T> inspector, Mafi.Unity.Ui.Library.Inspectors.BufferWithMultipleProductsUi buffer, System.Action<Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity>>> getBreakdowns, System.Func<Mafi.Quantity> getCapacity) where T : class, Mafi.Core.Entities.IEntity; + public static void AttachProductBreakdownFloater(Mafi.Unity.UiToolkit.Component.UiComponent anchor, System.Action<Mafi.Collections.Lyst<Mafi.Core.ProductQuantity>> getBreakdown, System.Func<Mafi.Quantity> getCapacity, System.Func<Mafi.Localization.LocStrFormatted> getTitle = null, bool showNumbers = false); + public static Mafi.Option<Mafi.Unity.UiToolkit.Component.UiComponent> BuildBreakdownFloaterView(Mafi.Localization.LocStrFormatted title, Mafi.Collections.Lyst<Mafi.Core.ProductQuantity> breakdown, Mafi.Quantity capacity, bool showNumbers = false); + public static System.Func<Mafi.Core.Products.ProductProto, Mafi.Option<Mafi.Unity.UiToolkit.Component.UiComponent>> CreateBreakdownFloaterFactory<T>(this Mafi.Unity.Ui.Library.Inspectors.BaseInspector<T> inspector, System.Action<Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Collections.Dict<Mafi.Core.Products.ProductProto, Mafi.Quantity>>> getBreakdowns, System.Func<Mafi.Core.Products.ProductProto, Mafi.Quantity> getCapacityFor) where T : class, Mafi.Core.Entities.IEntity; + }
ProductivityCounterUi class changed public class ProductivityCounterUi { + public ProductivityCounterUi(string iconPath, Mafi.Localization.LocStr monthlyTitle, Mafi.Localization.LocStr yearlyTitle); + public Mafi.Unity.Ui.Library.Inspectors.ProductivityCounterUi ConnectTo(System.Func<Mafi.Core.Factory.ProductivityCounterHistory> getHistory, System.Func<Mafi.Core.Factory.ProductivityCounterHistory.Data> getOngoingMonth, System.Func<int> getOngoingMonthTicks, System.Func<Mafi.Core.Factory.ProductivityCounterLabels> getLabels); + public Mafi.Unity.Ui.Library.Inspectors.ProductivityCounterUi ConnectToCompletedMonths(System.Func<Mafi.Core.Factory.ProductivityCounterHistory> getHistory, System.Func<Mafi.Core.Factory.ProductivityCounterLabels> getLabels); }
StorageAlertUi class changed public static class StorageAlertUi { public static Mafi.Unity.UiToolkit.Library.ButtonIcon CreateStorageAlertBtn<T>( this Mafi.Unity.Ui.Library.Inspectors.BaseInspector<T> inspector, - ) where T : class, Mafi.Core.Entities.IRenderedEntity, Mafi.Core.Buildings.Storages.IEntityWithStorageAlert; + ) where T : class, Mafi.Core.Buildings.Storages.IEntityWithStorageAlert, Mafi.Core.Entities.IRenderedEntity; }
VehicleAssignerUiExtension class changed public static class VehicleAssignerUiExtension { public static Mafi.Unity.UiToolkit.Library.PanelWithHeader AddVehicleAssigner<TEntity, TProto>( this Mafi.Unity.Ui.Library.Inspectors.BaseInspector<TEntity> inspector, Mafi.Localization.LocStrFormatted title, Mafi.Localization.LocStrFormatted? tooltip = null, bool collapseIfEmpty = false, - ) where TEntity : class, Mafi.Core.Entities.IEntityAssignedWithVehicles, Mafi.Core.Entities.IRenderedEntity where TProto : Mafi.Core.Entities.Dynamic.DrivingEntityProto; + ) where TEntity : class, Mafi.Core.Entities.IRenderedEntity, Mafi.Core.Entities.IEntityAssignedWithVehicles where TProto : Mafi.Core.Entities.Dynamic.DrivingEntityProto; }
}
namespace Mafi.Unity.Ui.ProtoPopups {
ProtoStatDef class changed public class ProtoStatDef { - public readonly Mafi.Localization.LocStrFormatted DefaultTooltip; public ProtoStatDef( int order, Mafi.Option<string> iconPath, - Mafi.Localization.LocStrFormatted tooltip, + Mafi.Localization.LocStr tooltip, Mafi.Unity.Ui.ProtoPopups.ProtoStatCat category, Mafi.ColorRgba? color = null, System.Action<Mafi.Unity.UiToolkit.Library.Row> customize = null, ); + public ProtoStatDef(int order, Mafi.Option<string> iconPath, System.Func<Mafi.Localization.LocStrFormatted> formatTooltip, Mafi.Unity.Ui.ProtoPopups.ProtoStatCat category, Mafi.ColorRgba? color = null, System.Action<Mafi.Unity.UiToolkit.Library.Row> customize = null); + public Mafi.Localization.LocStrFormatted GetDefaultTooltip(); }
}
namespace Mafi.Unity.Ui.SpaceProgram {
OrbitWindow class changed public class OrbitWindow { + public bool IsAsteroidsOpen { get; } public class Controller { public Controller( Mafi.Unity.InputControl.ControllerContext controllerContext, Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Unity.InputControl.UnlockedProtosDbForUi unlockedProtosDb, + Mafi.Core.SpaceProgram.AsteroidsManager asteroidsManager, Mafi.Unity.Ui.Hud.ToolbarHud toolbar, ); } }
}
namespace Mafi.Unity.Ui.Trains {
TrainGroupingStatsCache class added + public class TrainGroupingStatsCache { + public TrainGroupingStatsCache(Mafi.Core.Simulation.ICalendar calendar, System.Func<Mafi.Core.Trains.Train, Mafi.Core.Factory.ProductivityCounterHistory> getHistory); + public Mafi.Core.Factory.ProductivityCounterHistory GetAverageHistory(Mafi.Option<Mafi.Core.Trains.ITrainGrouping> grouping); + public void Invalidate(); + }
}
namespace Mafi.Unity.UiStatic.Hub {
HubDownloads class changed public static class HubDownloads { - public static void TryDeleteFile(string path); }
}
namespace Mafi.Unity.UiToolkit {
UiRoot class changed public class UiRoot { - public UiRoot(Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.Audio.AudioDb audioDb); + public UiRoot(Mafi.Unity.AssetsDb assetsDb, Mafi.Unity.Audio.AudioDb audioDb, Mafi.Unity.Audio.UiSoundsPlayer uiSounds); }
}
namespace Mafi.Unity.UiToolkit.Component {
ButtonExtensions class changed public static class ButtonExtensions { public static T CustomClickSound<T>( this T component, - string pathToSound, + Mafi.Core.Audio.SoundProto sound, ) where T : Mafi.Unity.UiToolkit.Component.IButtonComponent; + public static T CustomClickSound<T>(this T component, Mafi.Unity.Audio.UiSound sound) where T : Mafi.Unity.UiToolkit.Component.IButtonComponent; }
IButtonComponent interface changed public interface IButtonComponent { + void SetCustomClickSound(Mafi.Core.Audio.SoundProto sound); + void SetCustomClickSound(Mafi.Unity.Audio.UiSound sound); - void SetCustomClickSound(string pathToSound); }
UiComponentBackgroundExtensions class changed public static class UiComponentBackgroundExtensions { + public static T BackgroundNow<T>(this T component, Mafi.Unity.AssetsDb assetsDb, string imageAssetPath) where T : Mafi.Unity.UiToolkit.Component.IComponentWithBackground; + public static T BackgroundNow<T>(this T component, UnityEngine.Texture2D texture) where T : Mafi.Unity.UiToolkit.Component.IComponentWithBackground; }
UiComponentClassExtensions class changed public static class UiComponentClassExtensions { + public static T ClassBoldOverride<T>(this T component, bool isBold) where T : Mafi.Unity.UiToolkit.Component.IComponentWithClass; }
UiComponentFlexExt class changed public static class UiComponentFlexExt { public static T Gap<T>( this T component, Mafi.Px? mainAxis = null, Mafi.Px? crossAxis = null, - ) where T : Mafi.Unity.UiToolkit.Component.IFlexComponent, Mafi.Unity.UiToolkit.Component.UiComponent; + ) where T : Mafi.Unity.UiToolkit.Component.UiComponent, Mafi.Unity.UiToolkit.Component.IFlexComponent; }
UiComponentOrderExtensions class changed public static class UiComponentOrderExtensions { public static void InsertOrdered<T>( this Mafi.Unity.UiToolkit.Component.UiComponent component, T toInsert, - ) where T : Mafi.Unity.UiToolkit.Component.IUiComponentWithOrder, Mafi.Unity.UiToolkit.Component.UiComponent; + ) where T : Mafi.Unity.UiToolkit.Component.UiComponent, Mafi.Unity.UiToolkit.Component.IUiComponentWithOrder; }
UiComponentWithImageExtensions class changed public static class UiComponentWithImageExtensions { public static T Image<T>( this T component, string path, - ) where T : Mafi.Unity.UiToolkit.Component.IComponentWithImage, Mafi.Unity.UiToolkit.Component.UiComponent; + ) where T : Mafi.Unity.UiToolkit.Component.UiComponent, Mafi.Unity.UiToolkit.Component.IComponentWithImage; }
}
namespace Mafi.Unity.UiToolkit.Library {
Button class changed public class Button { + void Mafi.Unity.UiToolkit.Component.IButtonComponent.SetCustomClickSound(Mafi.Core.Audio.SoundProto sound); + void Mafi.Unity.UiToolkit.Component.IButtonComponent.SetCustomClickSound(Mafi.Unity.Audio.UiSound sound); - void Mafi.Unity.UiToolkit.Component.IButtonComponent.SetCustomClickSound(string pathToSound); }
ConfirmationPopup<T> class changed public class ConfirmationPopup<T> { + public Mafi.Unity.UiToolkit.Library.ConfirmationPopup<T> SecondaryAction(Mafi.Localization.LocStrFormatted text, System.Action onClick); }
DisplayExtensions class changed public static class DisplayExtensions { public static T IsWorkingObserve<T>( this T c, System.Func<bool> observer, - ) where T : Mafi.Unity.UiToolkit.Library.IComponentWithStateColor, Mafi.Unity.UiToolkit.Component.UiComponent; + ) where T : Mafi.Unity.UiToolkit.Component.UiComponent, Mafi.Unity.UiToolkit.Library.IComponentWithStateColor; }
Grid class changed public class Grid { public void InsertOrdered<T>( T toInsert, - ) where T : Mafi.Unity.UiToolkit.Component.IUiComponentWithOrder, Mafi.Unity.UiToolkit.Component.UiComponent; + ) where T : Mafi.Unity.UiToolkit.Component.UiComponent, Mafi.Unity.UiToolkit.Component.IUiComponentWithOrder; }
LazyWindow<T> class changed public class LazyWindow<T> { + public T OpenAndReturn(); }
Radio class changed public class Radio { + public Mafi.Unity.UiToolkit.Library.Radio Icon(Mafi.Unity.UiToolkit.Library.Icon icon); }
TextField class changed public class TextField { + public Mafi.Unity.UiToolkit.Library.TextField ClearFocusOnReturn(); }
Window class changed public class Window { - public void Open(Mafi.Unity.UiToolkit.UiRoot root, Mafi.Unity.UiToolkit.UiLayer layer); + public void Open(Mafi.Unity.UiToolkit.UiRoot root, Mafi.Unity.UiToolkit.UiLayer layer, bool noFade = false); - public Mafi.Unity.UiToolkit.Library.Window ShortcutToShow(Mafi.Unity.InputControl.KeyBindings shortcut); + public Mafi.Unity.UiToolkit.Library.Window ShortcutToShow(Mafi.Unity.InputControl.KbHandle shortcut); }
WindowExtensions class changed public static class WindowExtensions { public static void OpenIn( this Mafi.Unity.UiToolkit.Library.Window window, Mafi.Unity.UiToolkit.Library.IWindowHost host, + bool noFade = false, ); }
}
namespace Mafi.Unity.Utils {
ReloadAfterAssetUpdateManager class changed public class ReloadAfterAssetUpdateManager { public bool TryUnregisterAndDispose<T>( T instance, - ) where T : System.IDisposable, Mafi.Unity.Utils.IReloadAfterAssetUpdate; + ) where T : Mafi.Unity.Utils.IReloadAfterAssetUpdate, System.IDisposable; }
}
namespace Mafi.Unity.Weather {
WeatherController class changed public class WeatherController { public WeatherController( Mafi.Core.GameLoop.IGameLoopEvents gameLoopEvents, Mafi.Core.Environment.IWeatherManager weatherManager, Mafi.Unity.Camera.CameraController cameraController, Mafi.Unity.Camera.LightController lightController, Mafi.Unity.Weather.FogController fogController, Mafi.Unity.Weather.SkyboxController skyboxController, Mafi.Unity.AssetsDb assetsDb, - Mafi.Unity.Audio.AudioDb audioDb, + Mafi.Unity.Audio.Engine.SoundEngine soundEngine, + Mafi.Unity.Camera.SimCameraState cameraState, + Mafi.Core.Prototypes.ProtosDb protosDb, Mafi.Unity.Weather.IWeatherRenderingConfig config, Mafi.Core.RandomProvider randomProvider, - Mafi.Core.Terrain.TerrainManager terrainManager, ); + public float VisualRainIntensity { get; } }
}