diff --git a/Constructor5.Base/Constructor5.Base.csproj b/Constructor5.Base/Constructor5.Base.csproj index ec24336..ab2dc35 100644 --- a/Constructor5.Base/Constructor5.Base.csproj +++ b/Constructor5.Base/Constructor5.Base.csproj @@ -236,8 +236,10 @@ + + diff --git a/Constructor5.Base/DebugCommandSystem/CreateElementCommand.cs b/Constructor5.Base/DebugCommandSystem/CreateElementCommand.cs index 015f89e..00f97b2 100644 --- a/Constructor5.Base/DebugCommandSystem/CreateElementCommand.cs +++ b/Constructor5.Base/DebugCommandSystem/CreateElementCommand.cs @@ -1,10 +1,5 @@ using Constructor5.Base.ElementSystem; using Constructor5.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Constructor5.Base.DebugCommandSystem { diff --git a/Constructor5.Base/ElementSystem/ElementManager.cs b/Constructor5.Base/ElementSystem/ElementManager.cs index 9f4fcd7..4bb299f 100644 --- a/Constructor5.Base/ElementSystem/ElementManager.cs +++ b/Constructor5.Base/ElementSystem/ElementManager.cs @@ -17,10 +17,10 @@ public static class ElementManager public static Element FocusedElement { get; set; } - public static Element Create(Type type, string label, bool isContextSpecific = false) + public static Element Create(Type type, string label, bool isContextSpecific = false, string guidOverride = null) { var result = (Element)Reflection.CreateObject(type); - result.Guid = GenerateGuid(); + result.Guid = guidOverride != null ? guidOverride : GenerateGuid(); result.UserFacingId = !isContextSpecific ? GenerateID(label) : GenerateID(result.Guid); result.IsContextSpecific = isContextSpecific; if (isContextSpecific) @@ -38,9 +38,9 @@ public static Element Create(Type type, string label, bool isContextSpecific = f return result; } - public static T CreateTemporary() where T : Element + public static T CreateTemporary(string guidOverride = null) where T : Element { - var result = (T)Create(typeof(T), null, true); + var result = (T)Create(typeof(T), null, true, guidOverride); result.IsTemporary = true; return result; } diff --git a/Constructor5.Base/LocalizationSystem/LocalizableTextStringsXML.xml b/Constructor5.Base/LocalizationSystem/LocalizableTextStringsXML.xml index ef89916..e413a98 100644 --- a/Constructor5.Base/LocalizationSystem/LocalizableTextStringsXML.xml +++ b/Constructor5.Base/LocalizationSystem/LocalizableTextStringsXML.xml @@ -1224,4 +1224,79 @@ It is recommended you include your creator name in custom tags, to prevent confl There was an error importing the custom image. This can happen when DDSPanel, the library used for converting images to the game-recognized DDS format, fails. Try applying an effect or resizing the image to a power of 2 number (8x8, 16x16, 32x32, 64x64, etc) + Additional User Selection Filter + In addition to the main filter, Sims must meet this filter to be selectable in the Plan a Social Event UI. This does not apply to auto invited or hired Sims. + Main Filter + + Is Optional + If checked, the game will prefer Sims that match this term, but can still use other Sims if there are no existing Sims that match it. + + Ideal Value + + Ban All Celebrities + + Fully Simulate Off Lot + If checked, the value of the commodity will actively change in the background, even if the Sim is not instanced. This should only be used if you need to access the value without instancing the Sim, otherwise "Decay Off Lot" will be enough. + + Global Trait + If checked, the trait will automatically be added to all Sims who meet the age requirements. This requires the player to have Script Mods enabled. These traits should generally be set to hidden. + + Temporary Trait + If set, the defined trait will be added when the buff is added, and removed when it is removed. You can use this to access features that aren't available on buffs, such as blocked emotions, or just to make the trait appear in the UI. Temporary traits should usually have "Non Persisted" checked in "Special Cases" (this is done by default for traits created with the + button). + + Add Shift + Remove Shift + Start Hour + Min Amount + Max Amount + + Yoga + Multiply min and max Sims based on the number of instances of an object + Situations + Spawn Times + Add Spawn Time + Remove Spawn Time + Object Tag + + Zone Director/Lot Spawn Logic (Experimental) + No Zone Director Type Selected + Shift-Based Zone Director + Enabled + Object-Based Multiplier Tags + Start Object-Based Multiplier From + Object Based Multiplier Iterations + + Lot Type Blacklist + Lot Type Whitelist + Lot Trait Blacklist + Lot Trait Whitelist + World Blacklist + World Whitelist + Is the lot an apartment? + Is the lot a penthouse? + Use Parent Lot + If the lot is a sub-venue (example: a Community Garden from Eco Lifestyle is a sub-venue of Community Space), the condition will check the parent venue instead of the sub-venue. + + Bowling + Paparazzi + Zone Director Merges + Allow shifts to overlap (should generally be checked for visitor roles, but unchecked for staff roles) + Increase multiplier every # instances + Starting from instance # + A maximum of # times + + You can merge this zone director with one or more zone directors that are already in the game. This allows you to insert your own custom spawn logic to existing venues. + + These conditions must pass for the event to be selected. + Information about a Sim's location, such as the lot type, whether or not they're standing on the lot, and whether they're indoors or outdoors. + Lot Info Condition + Information about the current lot, including the type, lot traits and world. Unlike a Location Info condition, this doesn't know anything about the Sim and can't detect whether the Sim is standing on the lot or not, or any other Sim-specific info. + + Active Career Events + Career Event + + Use Custom Score Type + Mod Constructor does not have score data for the selected pie menu category, so the interaction will not be effected by Conversation Topic preferences from Growing Together. You can specify the score type manually in the "Advanced" tab. + + \ No newline at end of file diff --git a/Constructor5.Base/ProgramSettings.cs b/Constructor5.Base/ProgramSettings.cs index 3fd92bd..166d9fa 100644 --- a/Constructor5.Base/ProgramSettings.cs +++ b/Constructor5.Base/ProgramSettings.cs @@ -1,4 +1,5 @@ using Constructor5.Base.Properties; +using System; namespace Constructor5.Base { @@ -10,12 +11,20 @@ public static string CreatorName set => Settings.Default.CreatorName = value; } + public static string GetTS4Exe() => $"{Settings.Default.TS4Folder}/Game/Bin/TS4_x64.exe"; + public static bool ShowAllSettingEnabled { get => Settings.Default.ShowAllSettingEnabled; set => Settings.Default.ShowAllSettingEnabled = value; } + public static string TS4Folder + { + get => Settings.Default.TS4Folder; + set => Settings.Default.TS4Folder = value; + } + public static void Save() => Settings.Default.Save(); } } \ No newline at end of file diff --git a/Constructor5.Base/Properties/Settings.Designer.cs b/Constructor5.Base/Properties/Settings.Designer.cs index 90d7e8a..21744cf 100644 --- a/Constructor5.Base/Properties/Settings.Designer.cs +++ b/Constructor5.Base/Properties/Settings.Designer.cs @@ -58,5 +58,17 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio this["ShowAllSettingEnabled"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("C:\\Program Files\\EA Games\\The Sims 4")] + public string TS4Folder { + get { + return ((string)(this["TS4Folder"])); + } + set { + this["TS4Folder"] = value; + } + } } } diff --git a/Constructor5.Base/Properties/Settings.settings b/Constructor5.Base/Properties/Settings.settings index 3864706..0f05cab 100644 --- a/Constructor5.Base/Properties/Settings.settings +++ b/Constructor5.Base/Properties/Settings.settings @@ -11,5 +11,8 @@ False + + C:\Program Files\EA Games\The Sims 4 + \ No newline at end of file diff --git a/Constructor5.Base/Python/GlobalTraitPythonStep.cs b/Constructor5.Base/Python/GlobalTraitPythonStep.cs new file mode 100644 index 0000000..d0527e9 --- /dev/null +++ b/Constructor5.Base/Python/GlobalTraitPythonStep.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Constructor5.Base.Python +{ + public class GlobalTraitPythonStep : PythonBuildStep + { + public static GlobalTraitPythonStep Current { get; } = new GlobalTraitPythonStep(); + + public void AddTrait(ulong traitKey) => GlobalTraits.Add(traitKey); + + public override string GetContent() + { + var result = new StringBuilder(); + + if (GlobalTraits.Count > 0) + { + result.AppendLine("@inject_to(Sim, 'on_add')"); + result.AppendLine("def add_traits_after_sim_spawned(original, self, *args, **kwargs):"); + result.AppendLine(" result = original(self, *args, **kwargs)"); + result.AppendLine(" add_traits_to_sim(self.sim_info)"); + result.AppendLine(" return result"); + + result.AppendLine("def add_traits_to_sim(sim_info):"); + result.AppendLine(" trait_manager = services.trait_manager()"); + result.AppendLine(" if sim_info is None:"); + result.AppendLine(" return"); + foreach(var trait in GlobalTraits) + { + result.AppendLine($" sim_info.add_trait(trait_manager.get({trait}))"); + } + } + + return result.ToString(); + } + + public override IEnumerable GetHeaders() => new[] { "import services", "from sims.sim import Sim" }; + + protected internal override void Cleanup() => GlobalTraits.Clear(); + + protected List GlobalTraits { get; } = new List(); + } +} diff --git a/Constructor5.Base/Python/MergeZoneDirectorPythonStep.cs b/Constructor5.Base/Python/MergeZoneDirectorPythonStep.cs new file mode 100644 index 0000000..d410741 --- /dev/null +++ b/Constructor5.Base/Python/MergeZoneDirectorPythonStep.cs @@ -0,0 +1,68 @@ +using Constructor5.Base.ProjectSystem; +using System.Collections.Generic; +using System.Text; + +namespace Constructor5.Base.Python +{ + public class MergeZoneDirectorPythonStep : PythonBuildStep + { + public static MergeZoneDirectorPythonStep Current { get; } = new MergeZoneDirectorPythonStep(); + + public void Add(ulong mergeTo, ulong toMerge) + { + if (!ToMerge.ContainsKey(mergeTo)) + { + ToMerge.Add(mergeTo, new List()); + } + + if (!ToMerge[mergeTo].Contains(toMerge)) + { + ToMerge[mergeTo].Add(toMerge); + } + } + + public override string GetContent() + { + var result = new StringBuilder(); + + if (ToMerge.Count > 0) + { + result.AppendLine("@inject_to(InstanceManager, 'load_data_into_class_instances')"); + result.AppendLine($"def {Project.Id}_AddZoneDirector(original, self):"); + + result.AppendLine($" original(self)"); + result.AppendLine($" if self.TYPE == Types.ZONE_DIRECTOR:"); + + foreach (var merger in ToMerge) + { + foreach (var value in merger.Value) + { + result.AppendLine($" {Project.Id}_AddZoneDirectorInjector(self, {value}, {merger.Key})"); + } + } + + result.AppendLine(""); + result.AppendLine($"def {Project.Id}_AddZoneDirectorInjector(self, to_merge_key, value):"); + result.AppendLine($" manager = services.get_instance_manager(sims4.resources.Types.ZONE_DIRECTOR)"); + result.AppendLine($" merge_to = self._tuned_classes.get(sims4.resources.get_resource_key(value, Types.ZONE_DIRECTOR))"); + result.AppendLine($" if merge_to is None:"); + result.AppendLine($" return"); + result.AppendLine($" to_merge = manager.get(sims4.resources.get_resource_key(to_merge_key, Types.ZONE_DIRECTOR))"); + result.AppendLine($" if to_merge is None:"); + result.AppendLine($" return"); + result.AppendLine($" merge_to.situation_shifts = merge_to.situation_shifts + to_merge.situation_shifts"); + } + + return result.ToString(); + } + + public override IEnumerable GetHeaders() => new[] {"import sims4.resources", + "from sims4.tuning.instance_manager import InstanceManager", + "from sims4.resources import Types", + "import services"}; + + protected internal override void Cleanup() => ToMerge.Clear(); + + protected Dictionary> ToMerge { get; } = new Dictionary>(); + } +} diff --git a/Constructor5.Base/app.config b/Constructor5.Base/app.config index 0aad598..ce42a57 100644 --- a/Constructor5.Base/app.config +++ b/Constructor5.Base/app.config @@ -16,6 +16,9 @@ False + + C:\Program Files\EA Games\The Sims 4 + diff --git a/Constructor5.Core/Reflection.cs b/Constructor5.Core/Reflection.cs index 6ab0bcf..a59a74d 100644 --- a/Constructor5.Core/Reflection.cs +++ b/Constructor5.Core/Reflection.cs @@ -107,6 +107,7 @@ private static IEnumerable GetAssemblies() Assembly.Load("Constructor5.SimFilterTypes"), Assembly.Load("Constructor5.SituationGoalTemplates"), Assembly.Load("Constructor5.BasicExtraTypes"), + Assembly.Load("Constructor5.ZoneDirectorTemplates"), }; var pluginsDir = DirectoryUtility.GetUserDirectory("Plugins"); diff --git a/Constructor5.DebugTools.FormGenerator/Constructor5.DebugTools.FormGenerator.csproj b/Constructor5.DebugTools.FormGenerator/Constructor5.DebugTools.FormGenerator.csproj index 87d529c..1ca4730 100644 --- a/Constructor5.DebugTools.FormGenerator/Constructor5.DebugTools.FormGenerator.csproj +++ b/Constructor5.DebugTools.FormGenerator/Constructor5.DebugTools.FormGenerator.csproj @@ -159,6 +159,10 @@ {92267ec9-b06a-44ac-b383-f40c4d6a5755} Constructor5.UI + + {3dce553c-be93-4464-be28-29c1a3bfd0c2} + Constructor5.ZoneDirectorTemplates + {8afd4531-4b69-42a6-aa95-37e8e527b058} Constructor5 diff --git a/Constructor5.DebugTools.PresetExtractor/Constructor5.DebugTools.PresetExtractor.csproj b/Constructor5.DebugTools.PresetExtractor/Constructor5.DebugTools.PresetExtractor.csproj index 09070da..502bf0e 100644 --- a/Constructor5.DebugTools.PresetExtractor/Constructor5.DebugTools.PresetExtractor.csproj +++ b/Constructor5.DebugTools.PresetExtractor/Constructor5.DebugTools.PresetExtractor.csproj @@ -129,6 +129,10 @@ {92267ec9-b06a-44ac-b383-f40c4d6a5755} Constructor5.UI + + {3dce553c-be93-4464-be28-29c1a3bfd0c2} + Constructor5.ZoneDirectorTemplates + \ No newline at end of file diff --git a/Constructor5.DebugTools.PresetExtractor/InstructionBatches.cs b/Constructor5.DebugTools.PresetExtractor/InstructionBatches.cs index f58e5b9..3e0f1cd 100644 --- a/Constructor5.DebugTools.PresetExtractor/InstructionBatches.cs +++ b/Constructor5.DebugTools.PresetExtractor/InstructionBatches.cs @@ -77,6 +77,11 @@ public static class InstructionBatches public static PresetInstruction[] PieMenuCategories { get; } = PresetInstruction.CreateBatch("Pie_Menu_Category", "PieMenuCategory", "All Pie Menu Categories", "_display_name", new Dictionary { + { "Conversation Topics - Friendly", "SubCat_Friendly" }, + { "Conversation Topics - Funny", "SubCat_Funny" }, + { "Conversation Topics - Mean", "SubCat_Mean" }, + { "Conversation Topics - Mischief", "SubCat_Mischief" }, + { "Conversation Topics - Romantic", "SubCat_Romantic" }, }); public static PresetInstruction[] Recipes { get; } = PresetInstruction.CreateBatch("Recipe", "Recipe", "All Recipes", "name", new Dictionary @@ -121,7 +126,6 @@ public static class InstructionBatches public static PresetInstruction[] SocialInteractions { get; } = PresetInstruction.CreateBatch("Interaction", "SocialInteraction", "All Social Interactions", "display_name", new Dictionary { - }, "SocialMixerInteraction"); public static PresetInstruction[] Traits { get; } = PresetInstruction.CreateBatch("Trait", "Trait", "All Traits", "display_name", new Dictionary @@ -166,5 +170,17 @@ public static class InstructionBatches public static PresetInstruction[] TemplateChoosers { get; } = PresetInstruction.CreateBatch("Template_Chooser", "TemplateChooser", "All Template Choosers", "reason", new Dictionary { }); + + public static PresetInstruction[] Regions { get; } = PresetInstruction.CreateBatch("Region", "Region", "All Worlds", "reason", new Dictionary + { + }); + + public static PresetInstruction[] ZoneModifiers { get; } = PresetInstruction.CreateBatch("Zone_Modifier", "ZoneModifier", "All Lot Traits", "reason", new Dictionary + { + }); + + public static PresetInstruction[] ZoneDirectors { get; } = PresetInstruction.CreateBatch("Zone_Director", "ZoneDirector", "All Zone Directors", "reason", new Dictionary + { + }); } } \ No newline at end of file diff --git a/Constructor5.Elements/Buffs/Components/BuffModifiersEditor.xaml b/Constructor5.Elements/Buffs/Components/BuffModifiersEditor.xaml index cd8d7bd..73c36c1 100644 --- a/Constructor5.Elements/Buffs/Components/BuffModifiersEditor.xaml +++ b/Constructor5.Elements/Buffs/Components/BuffModifiersEditor.xaml @@ -1,15 +1,16 @@ - + @@ -27,9 +28,10 @@ - + @@ -39,23 +41,25 @@ - + - + @@ -66,7 +70,7 @@ - + @@ -104,9 +108,10 @@ - + @@ -140,12 +145,13 @@ - + diff --git a/Constructor5.Elements/Buffs/Components/BuffSpecialCasesComponent.cs b/Constructor5.Elements/Buffs/Components/BuffSpecialCasesComponent.cs index c8a5a6a..9e95223 100644 --- a/Constructor5.Elements/Buffs/Components/BuffSpecialCasesComponent.cs +++ b/Constructor5.Elements/Buffs/Components/BuffSpecialCasesComponent.cs @@ -1,8 +1,11 @@ +using Constructor5.Base.ElementSystem; using Constructor5.Base.ExportSystem.AutoTuners; using Constructor5.Base.ExportSystem.Tuning; +using Constructor5.Base.ExportSystem.Tuning.Utilities; using Constructor5.Base.PropertyTypes; using Constructor5.Core; using Constructor5.Elements.TestConditions; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -28,6 +31,8 @@ public class BuffSpecialCasesComponent : BuffComponent [AutoTuneBasic("timeout_string")] public STBLString TimeoutStringOverride { get; set; } = new STBLString(); + public Reference TemporaryTrait { get; set; } = new Reference(); + protected internal override bool HasContent() => true; protected internal override void OnExport(BuffExportContext context) @@ -51,6 +56,52 @@ protected internal override void OnExport(BuffExportContext context) var tunableVariant2 = context.Tuning.Set("proximity_detection_tests", "proximity_tests"); TestConditionTuning.TuneTestList(tunableVariant2, proximityConditions, "proximity_tests"); } + + if (ElementTuning.GetSingleInstanceKey(TemporaryTrait) != null) + { + var addLoot = TuneTemporaryTraitAddLoot(context); + context.Tuning.Get("_loot_on_instance").Set(null, addLoot); + context.Tuning.Get("_loot_on_addition").Set(null, addLoot); + context.Tuning.Get("_loot_on_removal").Set(null, TuneTemporaryTraitRemoveLoot(context)); + } + } + + private ulong TuneTemporaryTraitRemoveLoot(BuffExportContext context) + { + var tuning = ElementTuning.Create(context.Element, "TemporaryTraitRemoveLoot"); + tuning.Class = "LootActions"; + tuning.InstanceType = "action"; + tuning.Module = "interactions.utils.loot"; + + var lootList = tuning.Get("loot_actions"); + + var tunableVariant1 = lootList.Set(null, "trait_remove"); + var tunableTuple1 = tunableVariant1.Get("trait_remove"); + var tunableVariant2 = tunableTuple1.Set("trait", "specific_trait"); + var tunableTuple2 = tunableVariant2.Get("specific_trait"); + tunableTuple2.Set("specific_trait", ElementTuning.GetSingleInstanceKey(TemporaryTrait)); + + TuningExport.AddToQueue(tuning); + + return tuning.InstanceKey; + } + + private ulong TuneTemporaryTraitAddLoot(BuffExportContext context) + { + var tuning = ElementTuning.Create(context.Element, "TemporaryTraitAddLoot"); + tuning.Class = "LootActions"; + tuning.InstanceType = "action"; + tuning.Module = "interactions.utils.loot"; + + var lootList = tuning.Get("loot_actions"); + + var tunableVariant1 = lootList.Set(null, "trait_add"); + var tunableTuple1 = tunableVariant1.Get("trait_add"); + tunableTuple1.Set("trait", ElementTuning.GetSingleInstanceKey(TemporaryTrait)); + + TuningExport.AddToQueue(tuning); + + return tuning.InstanceKey; } } } \ No newline at end of file diff --git a/Constructor5.Elements/Buffs/Components/BuffSpecialCasesEditor.xaml b/Constructor5.Elements/Buffs/Components/BuffSpecialCasesEditor.xaml index ce74192..9ff9c61 100644 --- a/Constructor5.Elements/Buffs/Components/BuffSpecialCasesEditor.xaml +++ b/Constructor5.Elements/Buffs/Components/BuffSpecialCasesEditor.xaml @@ -1,13 +1,14 @@ - + @@ -15,12 +16,19 @@ - + + + + + + + diff --git a/Constructor5.Elements/Buffs/Components/BuffSpecialCasesEditor.xaml.cs b/Constructor5.Elements/Buffs/Components/BuffSpecialCasesEditor.xaml.cs index b1fd2c9..0d3df86 100644 --- a/Constructor5.Elements/Buffs/Components/BuffSpecialCasesEditor.xaml.cs +++ b/Constructor5.Elements/Buffs/Components/BuffSpecialCasesEditor.xaml.cs @@ -1,3 +1,5 @@ +using Constructor5.Base.ElementSystem; +using Constructor5.Elements.Traits.Components; using Constructor5.UI.Shared; using System.Windows.Controls; @@ -9,5 +11,21 @@ public partial class BuffSpecialCasesEditor : UserControl, IObjectEditor public BuffSpecialCasesEditor() => InitializeComponent(); void IObjectEditor.SetObject(object obj, string tag) => DataContext = obj; + + private Element CreateTemporaryTrait() + { + var buff = (Buff)((BuffSpecialCasesComponent)DataContext).Element; + var buffInfo = buff.GetComponent(); + + var result = (Trait)ElementManager.Create(typeof(Trait), null, true); + + var traitInfo = result.GetTraitComponent(); + traitInfo.Name = buffInfo.Name; + traitInfo.Description = buffInfo.Description; + traitInfo.Icon = buffInfo.Icon; + + result.GetTraitComponent().IsNonPersisted = true; + return result; + } } } diff --git a/Constructor5.Elements/Buffs/PreferenceTraitTuner.cs b/Constructor5.Elements/Buffs/PreferenceTraitTuner.cs index 760a5b8..6ca3c56 100644 --- a/Constructor5.Elements/Buffs/PreferenceTraitTuner.cs +++ b/Constructor5.Elements/Buffs/PreferenceTraitTuner.cs @@ -41,7 +41,8 @@ public void TunePreferenceTrait() tuningName = "LikeLoot"; } - if (ElementTuning.GetSingleInstanceKey(buffReference) == 0) + var key = ElementTuning.GetSingleInstanceKey(buffReference); + if (key == 0 || key == null) { return; } diff --git a/Constructor5.Elements/Buffs/SharedBuffTuner.cs b/Constructor5.Elements/Buffs/SharedBuffTuner.cs index d40da43..b2f7fa6 100644 --- a/Constructor5.Elements/Buffs/SharedBuffTuner.cs +++ b/Constructor5.Elements/Buffs/SharedBuffTuner.cs @@ -12,7 +12,7 @@ public static class SharedBuffTuner { public static bool AlwaysHasContent(Element element) => element.GetContextModifier() != null; - public static TuningHeader CreateTuning(Element element, BuffComponent[] components, string subTuningName = null) + public static TuningHeader CreateTuning(Element element, BuffComponent[] components, string subTuningName = null, bool alwaysInvisible = false) { var tuning = ElementTuning.Create(element, subTuningName); tuning.Class = "Buff"; @@ -56,6 +56,11 @@ public static TuningHeader CreateTuning(Element element, BuffComponent[] compone CustomTuningExporter.Export(buff, tuning, buff.CustomTuning); } + if (alwaysInvisible) + { + tuning.Set("visible", "False"); + } + TuningExport.AddToQueue(tuning); return tuning; diff --git a/Constructor5.Elements/CASPreferences/CASPreference.cs b/Constructor5.Elements/CASPreferences/CASPreference.cs index a3ca5a2..cc320cd 100644 --- a/Constructor5.Elements/CASPreferences/CASPreference.cs +++ b/Constructor5.Elements/CASPreferences/CASPreference.cs @@ -22,18 +22,42 @@ public class CASPreference : Element, IExportableElement, ISupportsCustomTuning public bool AllowToddler { get; set; } = false; public bool AllowYoungAdult { get; set; } = true; + public TestCondition AutoCondition { get; set; } = new AlwaysRunCondition(); public Reference Category { get; set; } = new Reference(); public CustomTuningInfo CustomTuning { get; set; } = new CustomTuningInfo(); + public Reference DislikeBuff { get; set; } = new Reference(); public Reference DislikeTrait { get; set; } // do not add = new Reference(); public STBLString DislikeTraitName { get; set; } = new STBLString(); public ElementIcon Icon { get; set; } = new ElementIcon(); + public Reference LikeBuff { get; set; } = new Reference(); public Reference LikeTrait { get; set; } // do not add = new Reference(); public STBLString LikeTraitName { get; set; } = new STBLString(); public STBLString PreferenceName { get; set; } = new STBLString(); - public TestCondition AutoCondition { get; set; } = new AlwaysRunCondition(); - public Reference DislikeBuff { get; set; } = new Reference(); - public Reference LikeBuff { get; set; } = new Reference(); + public static Reference CreateDislikeTrait(CASPreference preference, string label) + { + var newReference = (Trait)ElementManager.Create(typeof(Trait), null, true); + newReference.Label = $"Dislikes {label}"; + newReference.ShowPreset = true; + newReference.AddContextModifier(new CASPreferenceContextModifier + { + CASPreference = new Reference(preference), + IsDislike = true + }); + return new Reference(newReference); + } + + public static Reference CreateLikeTrait(CASPreference preference, string label) + { + var newReference = (Trait)ElementManager.Create(typeof(Trait), null, true); + newReference.Label = $"Likes {label}"; + newReference.ShowPreset = true; + newReference.AddContextModifier(new CASPreferenceContextModifier + { + CASPreference = new Reference(preference) + }); + return new Reference(newReference); + } void IExportableElement.OnExport() { @@ -64,27 +88,12 @@ protected override void OnUserCreated(string label) if (LikeTrait == null) { - var newReference = (Trait)ElementManager.Create(typeof(Trait), null, true); - newReference.Label = $"Likes {label}"; - newReference.ShowPreset = true; - newReference.AddContextModifier(new CASPreferenceContextModifier - { - CASPreference = new Reference(this) - }); - LikeTrait = new Reference(newReference); + LikeTrait = CreateLikeTrait(this, label); } if (DislikeTrait == null) { - var newReference = (Trait)ElementManager.Create(typeof(Trait), null, true); - newReference.Label = $"Dislikes {label}"; - newReference.ShowPreset = true; - newReference.AddContextModifier(new CASPreferenceContextModifier - { - CASPreference = new Reference(this), - IsDislike = true - }); - DislikeTrait = new Reference(newReference); + DislikeTrait = CreateDislikeTrait(this, label); } } } diff --git a/Constructor5.Elements/CareerEvents/CareerEvent.cs b/Constructor5.Elements/CareerEvents/CareerEvent.cs index 1938443..9f22e35 100644 --- a/Constructor5.Elements/CareerEvents/CareerEvent.cs +++ b/Constructor5.Elements/CareerEvents/CareerEvent.cs @@ -6,12 +6,11 @@ using Constructor5.Base.ExportSystem.Tuning.Utilities; using Constructor5.Base.PropertyTypes; using Constructor5.Elements.TestConditions; -using System; using System.Collections.Generic; namespace Constructor5.Elements.CareerEvents { - [ElementTypeData("CareerEvent", false, ElementTypes = new[] { typeof(CareerEvent) }, PresetFolders = new[] { "CareerEvent" })] + //[ElementTypeData("CareerEvent", true, ElementTypes = new[] { typeof(CareerEvent) }, PresetFolders = new[] { "CareerEvent" })] public class CareerEvent : Element, IExportableElement, ISupportsCustomTuning { public Reference AdditionalRequiredVenue { get; set; } = new Reference(); @@ -43,6 +42,8 @@ public class CareerEvent : Element, IExportableElement, ISupportsCustomTuning public ReferenceList Venues { get; set; } = new ReferenceList(); + public Reference ZoneDirector { get; set; } = new Reference(); + void IExportableElement.OnExport() { var tuning = ElementTuning.Create(this); @@ -170,7 +171,7 @@ private void TuneContent(TuningHeader tuning) tunableTuple19.Set("situation", Situation); var tunableVariant20 = tuning.Set("zone_director", "enabled"); - tunableVariant20.Set("enabled", "277656"); + tunableVariant20.Set("enabled", ZoneDirector); } diff --git a/Constructor5.Elements/CareerEvents/CareerEventContextModifier.cs b/Constructor5.Elements/CareerEvents/CareerEventContextModifier.cs new file mode 100644 index 0000000..0e13818 --- /dev/null +++ b/Constructor5.Elements/CareerEvents/CareerEventContextModifier.cs @@ -0,0 +1,11 @@ +using Constructor5.Base.ElementSystem; +using Constructor5.Core; + +namespace Constructor5.Elements.CareerEvents +{ + [XmlSerializerExtraType] + public class CareerEventContextModifier : ContextModifier + { + public Reference Career { get; set; } = new Reference(); + } +} diff --git a/Constructor5.Elements/CareerEvents/CareerEventEditor.xaml b/Constructor5.Elements/CareerEvents/CareerEventEditor.xaml index 92f84ff..38be906 100644 --- a/Constructor5.Elements/CareerEvents/CareerEventEditor.xaml +++ b/Constructor5.Elements/CareerEvents/CareerEventEditor.xaml @@ -15,87 +15,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/Constructor5.Elements/CareerEvents/CareerEventEditor.xaml.cs b/Constructor5.Elements/CareerEvents/CareerEventEditor.xaml.cs index 7a23b0e..fa4e2b9 100644 --- a/Constructor5.Elements/CareerEvents/CareerEventEditor.xaml.cs +++ b/Constructor5.Elements/CareerEvents/CareerEventEditor.xaml.cs @@ -16,19 +16,5 @@ void IObjectEditor.SetObject(object obj, string tag) { DataContext = obj; } - - private Element ReferenceControl_CreateElementFunction() - { - var situation = (Situation)ElementManager.Create(typeof(Situation), null, true); - - situation.AddContextModifier(new CareerEventSituationContextModifier - { - CareerEvent = new Reference((CareerEvent)DataContext) - }); - - situation.GetComponent().Template = (SituationTemplate)Reflection.CreateObject(Reflection.GetTypeByName("CareerEventSituationTemplate")); - - return situation; - } } } \ No newline at end of file diff --git a/Constructor5.Elements/CareerEvents/CareerEventMiniEditor.xaml b/Constructor5.Elements/CareerEvents/CareerEventMiniEditor.xaml new file mode 100644 index 0000000..52dfa9e --- /dev/null +++ b/Constructor5.Elements/CareerEvents/CareerEventMiniEditor.xaml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Constructor5.Elements/CareerEvents/CareerEventMiniEditor.xaml.cs b/Constructor5.Elements/CareerEvents/CareerEventMiniEditor.xaml.cs new file mode 100644 index 0000000..54edaa4 --- /dev/null +++ b/Constructor5.Elements/CareerEvents/CareerEventMiniEditor.xaml.cs @@ -0,0 +1,34 @@ +using Constructor5.Base.ElementSystem; +using Constructor5.Core; +using Constructor5.Elements.Situations; +using Constructor5.Elements.Situations.Components; +using Constructor5.UI.Shared; +using System.Windows.Controls; + +namespace Constructor5.Elements.CareerEvents +{ + [ObjectEditor(typeof(CareerEvent), "ElementMini")] + public partial class CareerEventMiniEditor : UserControl, IObjectEditor + { + public CareerEventMiniEditor() => InitializeComponent(); + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + } + + private Element ReferenceControl_CreateElementFunction() + { + var situation = (Situation)ElementManager.Create(typeof(Situation), null, true); + + situation.AddContextModifier(new CareerEventSituationContextModifier + { + CareerEvent = new Reference((CareerEvent)DataContext) + }); + + situation.GetComponent().Template = (SituationTemplate)Reflection.CreateObject(Reflection.GetTypeByName("CareerEventSituationTemplate")); + + return situation; + } + } +} \ No newline at end of file diff --git a/Constructor5.Elements/Careers/Components/CareerEventsComponent.cs b/Constructor5.Elements/Careers/Components/CareerEventsComponent.cs new file mode 100644 index 0000000..6f8e5f0 --- /dev/null +++ b/Constructor5.Elements/Careers/Components/CareerEventsComponent.cs @@ -0,0 +1,22 @@ +/*using Constructor5.Base.ElementSystem; +using Constructor5.Base.ExportSystem.AutoTuners; +using Constructor5.Core; + +namespace Constructor5.Elements.Careers.Components +{ + [XmlSerializerExtraType] + public class CareerEventsComponent : CareerComponent + { + [AutoTuneReferenceList("career_events")] + public ReferenceList CareerEvents { get; set; } = new ReferenceList(); + + public override int ComponentDisplayOrder => 20; + + public override string ComponentLabel => "ActiveCareerEvents"; + + protected internal override void OnExport(CareerExportContext context) + { + AutoTunerInvoker.Invoke(this, context.Tuning); + } + } +}*/ \ No newline at end of file diff --git a/Constructor5.Elements/Careers/Components/CareerEventsComponentEditor.xaml b/Constructor5.Elements/Careers/Components/CareerEventsComponentEditor.xaml new file mode 100644 index 0000000..b5f90c9 --- /dev/null +++ b/Constructor5.Elements/Careers/Components/CareerEventsComponentEditor.xaml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/Constructor5.Elements/Careers/Components/CareerEventsComponentEditor.xaml.cs b/Constructor5.Elements/Careers/Components/CareerEventsComponentEditor.xaml.cs new file mode 100644 index 0000000..490a286 --- /dev/null +++ b/Constructor5.Elements/Careers/Components/CareerEventsComponentEditor.xaml.cs @@ -0,0 +1,32 @@ +using Constructor5.Base.ElementSystem; +using Constructor5.Elements.CareerEvents; +using Constructor5.UI.Shared; +using System.Windows.Controls; + +namespace Constructor5.Elements.Careers.Components +{ + //[ObjectEditor(typeof(CareerEventsComponent))] + public partial class CareerEventsComponentEditor : UserControl, IObjectEditor + { + public CareerEventsComponentEditor() => InitializeComponent(); + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + } + + private Element ReferenceListControl_CreateElementFunction() + { + return null; + /*var element = ((CareerEventsComponent)DataContext).Element; + + var result = ElementManager.Create(typeof(CareerEvent), null, true); + result.ShowPreset = true; + result.AddContextModifier(new CareerEventContextModifier + { + Career = new Reference(element) + }); + return result;*/ + } + } +} \ No newline at end of file diff --git a/Constructor5.Elements/Careers/Components/CareerLevelsComponentEditor.xaml b/Constructor5.Elements/Careers/Components/CareerLevelsComponentEditor.xaml index 837f57e..fb1fc1a 100644 --- a/Constructor5.Elements/Careers/Components/CareerLevelsComponentEditor.xaml +++ b/Constructor5.Elements/Careers/Components/CareerLevelsComponentEditor.xaml @@ -1,22 +1,24 @@ - + - + diff --git a/Constructor5.Elements/Commodities/CommoditySettingsComponent.cs b/Constructor5.Elements/Commodities/CommoditySettingsComponent.cs index 069a349..74e88c4 100644 --- a/Constructor5.Elements/Commodities/CommoditySettingsComponent.cs +++ b/Constructor5.Elements/Commodities/CommoditySettingsComponent.cs @@ -15,6 +15,7 @@ public class CommoditySettingsComponent : CommodityComponent public bool DecayOffLot { get; set; } = true; public double DecayRate { get; set; } = 1; + public bool FullySimulateOffLot { get; set; } [AutoTuneIfTrue("persisted_tuning", "False")] public bool IsNonPersisted { get; set; } @@ -39,17 +40,20 @@ protected internal override void OnExport(CommodityExportContext context) // decay off lot if (DecayOffLot) { - context.Tuning.Set("_time_passage_fixup_type", "FIXUP_USING_TIME_ELAPSED"); + if (FullySimulateOffLot) + { + context.Tuning.Set("_off_lot_simulation", "selectable_sims_and_npcs"); + } + else + { + context.Tuning.Set("_time_passage_fixup_type", "FIXUP_USING_TIME_ELAPSED"); + } } // min value tuning context.Tuning.Set("_default_convergence_value", "0"); context.Tuning.Set("min_value_tuning", "0"); - // max value tuning - /*context.Tuning.Set("max_value_tuning", "998"); - context.Tuning.Set("maximum_auto_satisfy_time", "998");*/ - // misc { var tunableTuple1 = context.Tuning.Get("initial_tuning"); diff --git a/Constructor5.Elements/Commodities/CommoditySettingsComponentEditor.xaml b/Constructor5.Elements/Commodities/CommoditySettingsComponentEditor.xaml index 80c7592..b99494f 100644 --- a/Constructor5.Elements/Commodities/CommoditySettingsComponentEditor.xaml +++ b/Constructor5.Elements/Commodities/CommoditySettingsComponentEditor.xaml @@ -1,14 +1,15 @@ - + @@ -22,6 +23,12 @@ + + + + + + diff --git a/Constructor5.Elements/Constructor5.Elements.csproj b/Constructor5.Elements/Constructor5.Elements.csproj index 2cb8bc4..b4e4714 100644 --- a/Constructor5.Elements/Constructor5.Elements.csproj +++ b/Constructor5.Elements/Constructor5.Elements.csproj @@ -55,7 +55,7 @@ - ..\packages\gong-wpf-dragdrop.3.1.1\lib\net48\GongSolutions.WPF.DragDrop.dll + ..\packages\gong-wpf-dragdrop.3.2.1\lib\net48\GongSolutions.WPF.DragDrop.dll @@ -228,9 +228,13 @@ + CareerEventEditor.xaml + + CareerEventMiniEditor.xaml + @@ -238,6 +242,10 @@ CareerLevelEditor.xaml + + + CareerEventsComponentEditor.xaml + CareerInteractionComponentEditor.xaml @@ -490,6 +498,7 @@ LotTraitInfoEditor.xaml + @@ -699,6 +708,9 @@ SituationJobRewardsEditor.xaml + + SituationJobSimFilterComponentEditor.xaml + SituationJobUniformEditor.xaml @@ -738,6 +750,9 @@ SituationEditor.xaml + + SituationMiniEditor.xaml + @@ -841,6 +856,20 @@ WhimMiniEditor.xaml + + + + ZoneDirectorMergeComponentEditor.xaml + + + + + + + ZoneDirectorEditor.xaml + + + @@ -983,6 +1012,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -995,6 +1028,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -1363,6 +1400,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -1395,6 +1436,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -1479,11 +1524,21 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + - + + + diff --git a/Constructor5.Elements/Interactions/Shared/DefaultInteractionTemplate.cs b/Constructor5.Elements/Interactions/Shared/DefaultInteractionTemplate.cs index 2bfaced..db31bb9 100644 --- a/Constructor5.Elements/Interactions/Shared/DefaultInteractionTemplate.cs +++ b/Constructor5.Elements/Interactions/Shared/DefaultInteractionTemplate.cs @@ -1,5 +1,6 @@ using Constructor5.Base.SelectableObjects; using Constructor5.Core; +using Constructor5.Elements.Interactions.Social; namespace Constructor5.Elements.Interactions.Shared { @@ -11,6 +12,10 @@ public class DefaultInteractionTemplate : InteractionTemplate { public override string Label => "Undefined"; + public override ulong GetCustomScoreTypeKey(InteractionExportContext context) => 0; + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) => 0; + protected internal override void OnExport(InteractionExportContext context) { } diff --git a/Constructor5.Elements/Interactions/Shared/InteractionExportContext.cs b/Constructor5.Elements/Interactions/Shared/InteractionExportContext.cs index f9e4e24..ec24b18 100644 --- a/Constructor5.Elements/Interactions/Shared/InteractionExportContext.cs +++ b/Constructor5.Elements/Interactions/Shared/InteractionExportContext.cs @@ -6,6 +6,7 @@ public abstract class InteractionExportContext { public InteractionElement Element { get; set; } public ulong? LearnTraitLootKey { get; set; } + public ulong ScoreTypeKey { get; set; } public ulong TraitKey { get; set; } public TuningBase Tuning { get; set; } } diff --git a/Constructor5.Elements/Interactions/Shared/InteractionTemplate.cs b/Constructor5.Elements/Interactions/Shared/InteractionTemplate.cs index a7f0369..3c2105b 100644 --- a/Constructor5.Elements/Interactions/Shared/InteractionTemplate.cs +++ b/Constructor5.Elements/Interactions/Shared/InteractionTemplate.cs @@ -3,6 +3,8 @@ using System.ComponentModel; using System.Xml.Serialization; using Constructor5.Base.ExportSystem.TuningActions; +using Constructor5.Base.ExportSystem.AutoTuners; +using Constructor5.Base.ElementSystem; namespace Constructor5.Elements.Interactions.Shared { @@ -16,6 +18,11 @@ public abstract class InteractionTemplate : INotifyPropertyChanged [XmlIgnore] public abstract string Label { get; } + [AutoTuneBasic("category")] + public virtual Reference PieMenuCategory { get; set; } = new Reference(); + + public bool UseCustomScoreType { get; set; } + protected internal abstract void OnExport(InteractionExportContext context); protected void RunTuningActions(InteractionExportContext context, string actionsFile) @@ -26,9 +33,14 @@ protected void RunTuningActions(InteractionExportContext context, string actions DataContext = this }; tuningContext.Variables.Add("LearnTraitLootKey", context.LearnTraitLootKey?.ToString()); + tuningContext.Variables.Add("ScoreTypeKey", context.ScoreTypeKey.ToString()); + TuningActionInvoker.InvokeFromFile($"Interactions/{actionsFile}", tuningContext); } protected internal virtual void OnSaveUpgrade(int oldVersion, int newVersion) { } + + public abstract ulong GetCustomScoreTypeKey(InteractionExportContext context); + public abstract ulong GetFallbackScoreType(SocialInteractionExportContext socialContext); } } \ No newline at end of file diff --git a/Constructor5.Elements/Interactions/Shared/InteractionTemplateComponentBase.cs b/Constructor5.Elements/Interactions/Shared/InteractionTemplateComponentBase.cs index 129fa99..7ab84a0 100644 --- a/Constructor5.Elements/Interactions/Shared/InteractionTemplateComponentBase.cs +++ b/Constructor5.Elements/Interactions/Shared/InteractionTemplateComponentBase.cs @@ -1,8 +1,10 @@ +using Constructor5.Base.ExportSystem; using Constructor5.Base.ExportSystem.Tuning.Utilities; using Constructor5.Base.ExportSystem.TuningActions; using Constructor5.Elements.Interactions.Social; using Constructor5.Elements.Interactions.Social.ContextModifiers; using Constructor5.Elements.Traits.Components; +using System; namespace Constructor5.Elements.Interactions.Shared { @@ -29,9 +31,69 @@ protected internal override void OnExport(InteractionExportContext context) } } + socialContext.ScoreTypeKey = GetScoreTypeKey(socialContext); + Template.OnExport(context); } + private ulong GetScoreTypeKey(SocialInteractionExportContext socialContext) + { + if (Template.UseCustomScoreType) + { + return Template.GetCustomScoreTypeKey(socialContext); + } + + switch (ElementTuning.GetSingleInstanceKey(Template.PieMenuCategory)) + { + case 318696: // friendly activities + return 24555; + case 318318: // friendly affection + return 318537; + case 308262: // friendly complaints + return 314877; + case 308258: // friendly compliments + return 314876; + case 308257: // friendly deep thoughts + return 314813; + case 308263: // friendly gossip + return 314878; + case 308260: // friendly hobbies + return 314880; + case 308259: // friendly interests + return 314879; + case 308261: // friendly small talk + return 314881; + case 308256: // friendly stories + return 314812; + case 308253: // funny jokes + return 315250; + case 308254: // funny potty humor + return 315251; + case 308255: // funny silly behavior + return 315252; + case 311656: // funny stories + return 315253; + case 308251: // mean arguments + return 324172; + case 308252: // mean malicious + return 314808; + case 308139: // mischief deception + return 314806; + case 308250: // mischief pranks + return 314804; + case 308138: // romantic affection + return 314811; + case 308137: // romantic flirtation + return 314810; + case 308136: // romantic physical intimacy + return 314809; + case 103107: // tell group story + return 314812; + } + + return Template.GetFallbackScoreType(socialContext); + } + private ulong CreateLearnTraitLoot(SocialInteractionExportContext context) { var tuning = ElementTuning.Create(context.Element, "LearnTraitLoot"); diff --git a/Constructor5.Elements/LotTraits/LotTrait.cs b/Constructor5.Elements/LotTraits/LotTrait.cs index dd41032..bbe920e 100644 --- a/Constructor5.Elements/LotTraits/LotTrait.cs +++ b/Constructor5.Elements/LotTraits/LotTrait.cs @@ -9,7 +9,7 @@ namespace Constructor5.Elements.LotTraits { - [ElementTypeData("LotTrait", true, ElementTypes = new[] { typeof(LotTrait) }, PresetFolders = new[] { "LotTrait" }, IsRootType = true)] + [ElementTypeData("LotTrait", true, ElementTypes = new[] { typeof(LotTrait) }, PresetFolders = new[] { "ZoneModifier" }, IsRootType = true)] public class LotTrait : SimpleComponentElement, IExportableElement, ISupportsCustomTuning { public CustomTuningInfo CustomTuning { get; set; } = new CustomTuningInfo(); diff --git a/Constructor5.Elements/Need/Need.cs b/Constructor5.Elements/Need/Need.cs new file mode 100644 index 0000000..bf05c8d --- /dev/null +++ b/Constructor5.Elements/Need/Need.cs @@ -0,0 +1,15 @@ +using Constructor5.Base.ElementSystem; +using Constructor5.Elements.Commodities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Constructor5.Elements.Need +{ + [ElementTypeData(ElementTypes = new[] { typeof(Commodity) }, PresetFolders = new[] { "Need" })] + public class Need : Element + { + } +} diff --git a/Constructor5.Elements/ObjectiveSets/ObjectiveSet.cs b/Constructor5.Elements/ObjectiveSets/ObjectiveSet.cs index 3b84b08..5a161a6 100644 --- a/Constructor5.Elements/ObjectiveSets/ObjectiveSet.cs +++ b/Constructor5.Elements/ObjectiveSets/ObjectiveSet.cs @@ -8,6 +8,7 @@ using Constructor5.Base.ExportSystem.Tuning.Utilities; using Constructor5.Base.PropertyTypes; using Constructor5.Elements.AspirationTracks; +using Constructor5.Elements.Objectives; using System.Collections.Generic; using System.Linq; @@ -34,8 +35,37 @@ public class ObjectiveSet : Element, IExportableElement, ISupportsCustomTuning [AutoTuneBasic("reward")] public Reference Reward { get; set; } = new Reference(); + public void AssignDataToObjective(Objective element, bool isNew) + { + var isCareerOrAssignment = GetContextModifier() != null + || GetContextModifier() != null; + + if (isNew) + { + element.AlwaysTrack = + GetContextModifier() == null + && !isCareerOrAssignment; + } + + if (GetContextModifier() != null) + { + element.NonResettable = true; + } + } + void IExportableElement.OnExport() { + // fix from previous versions + foreach (var refItem in Objectives.Items) + { + var objective = refItem.Reference.Element as Objective; + if (objective == null) + { + continue; + } + AssignDataToObjective(objective, false); + } + var tuning = ElementTuning.Create(this); tuning.Class = "Aspiration"; tuning.InstanceType = "aspiration"; diff --git a/Constructor5.Elements/ObjectiveSets/ObjectiveSetEditor.xaml.cs b/Constructor5.Elements/ObjectiveSets/ObjectiveSetEditor.xaml.cs index 04d1776..3e610e8 100644 --- a/Constructor5.Elements/ObjectiveSets/ObjectiveSetEditor.xaml.cs +++ b/Constructor5.Elements/ObjectiveSets/ObjectiveSetEditor.xaml.cs @@ -25,14 +25,11 @@ private Element ReferenceListControl_CreateElementFunction() { var component = (ObjectiveSet)DataContext; - var isCareerOrAssignment = component.GetContextModifier() != null - || component.GetContextModifier() != null; - var element = (Objective)ElementManager.Create(typeof(Objective), null, true); - element.AlwaysTrack = - component.GetContextModifier() == null - && !isCareerOrAssignment; + component.AssignDataToObjective(element, true); + var isCareerOrAssignment = component.GetContextModifier() != null + || component.GetContextModifier() != null; if (isCareerOrAssignment) { ObjectivesListControl.EditorTag = "NoSatisfactionPoints"; diff --git a/Constructor5.Elements/Objectives/Objective.cs b/Constructor5.Elements/Objectives/Objective.cs index 27ab987..7173ef9 100644 --- a/Constructor5.Elements/Objectives/Objective.cs +++ b/Constructor5.Elements/Objectives/Objective.cs @@ -36,6 +36,8 @@ public class Objective : Element, IExportableElement, ISupportsCustomTuning [AutoTuneBasic("tooltip")] public STBLString ToolTip { get; set; } = new STBLString(); + public bool NonResettable { get; set; } + // public bool IsResettable { get; set; } void IExportableElement.OnExport() @@ -68,7 +70,11 @@ void IExportableElement.OnExport() BuildSimData(tuning); } - tuning.Set("resettable", true); + if (!NonResettable) + { + tuning.Set("resettable", true); + } + CustomTuningExporter.Export(this, tuning, CustomTuning); diff --git a/Constructor5.Elements/Rewards/RewardSet.cs b/Constructor5.Elements/Rewards/RewardSet.cs index 0c3130c..4e33dd9 100644 --- a/Constructor5.Elements/Rewards/RewardSet.cs +++ b/Constructor5.Elements/Rewards/RewardSet.cs @@ -14,7 +14,7 @@ namespace Constructor5.Elements.Rewards { - [ElementTypeData("RewardSet", true, PresetFolders = new[] { "Reward" })] + [ElementTypeData("RewardSet", true, ElementTypes = new[] { typeof(RewardSet) }, PresetFolders = new[] { "Reward" })] public class RewardSet : Element, IExportableElement { public STBLString Description { get; set; } = new STBLString(); diff --git a/Constructor5.Elements/Rewards/RewardSetMiniEditor.xaml b/Constructor5.Elements/Rewards/RewardSetMiniEditor.xaml index b67b58c..f9fbd85 100644 --- a/Constructor5.Elements/Rewards/RewardSetMiniEditor.xaml +++ b/Constructor5.Elements/Rewards/RewardSetMiniEditor.xaml @@ -1,26 +1,26 @@ - + - + - + @@ -30,10 +30,11 @@ - + @@ -44,18 +45,20 @@ - + - + @@ -63,18 +66,17 @@ - + - + - + diff --git a/Constructor5.Elements/Rewards/RewardSetMiniEditor.xaml.cs b/Constructor5.Elements/Rewards/RewardSetMiniEditor.xaml.cs index d5acb7f..b84e689 100644 --- a/Constructor5.Elements/Rewards/RewardSetMiniEditor.xaml.cs +++ b/Constructor5.Elements/Rewards/RewardSetMiniEditor.xaml.cs @@ -20,7 +20,7 @@ void IObjectEditor.SetObject(object obj, string tag) if (tag == "DescriptionAtTop") { UIInfoTab.Visibility = System.Windows.Visibility.Collapsed; - UIInfoStackPanel.Children.Remove(DescriptionField); + GenerateUIInfoStackPanel.Children.Remove(DescriptionField); DescriptionAtTopPresenter.Content = DescriptionField; } if (tag == "Aspiration") diff --git a/Constructor5.Elements/SimFilters/SimFilter.cs b/Constructor5.Elements/SimFilters/SimFilter.cs index f24c4e7..c3c882b 100644 --- a/Constructor5.Elements/SimFilters/SimFilter.cs +++ b/Constructor5.Elements/SimFilters/SimFilter.cs @@ -34,6 +34,8 @@ public class SimFilter : Element, IExportableElement, ISupportsCustomTuning public bool BanTraitSkeletons { get; set; } = true; public bool BanTraitTemperance { get; set; } = true; public bool BanTraitTownMascot { get; set; } = true; + public bool BanAllCelebrities { get; set; } + public bool BanBusySims { get; set; } public CustomTuningInfo CustomTuning { get; set; } = new CustomTuningInfo(); public bool IncludeLod { get; set; } = true; @@ -160,6 +162,15 @@ private void TuneStandard(TunableList filterTermsList) traitBlacklistKeys.Add(288294); } + if (BanAllCelebrities) + { + traitBlacklistKeys.Add(191807); + traitBlacklistKeys.Add(191819); + traitBlacklistKeys.Add(191820); + traitBlacklistKeys.Add(191817); + traitBlacklistKeys.Add(191818); + } + if (traitBlacklistKeys.Count > 0) { var blacklistVariant = filterTermsList.Set(null, "trait_blacklist"); @@ -206,6 +217,14 @@ private void TuneStandard(TunableList filterTermsList) { filterTermsList.Set(null, "in_compatible_region"); } + + if (BanBusySims) + { + var tunableVariant1 = filterTermsList.Set(null, "is_busy"); + var tunableTuple1 = tunableVariant1.Get("is_busy"); + tunableTuple1.Set("invert_score", "True"); + + } } } } \ No newline at end of file diff --git a/Constructor5.Elements/SimFilters/SimFilterMiniEditor.xaml b/Constructor5.Elements/SimFilters/SimFilterMiniEditor.xaml index a8cbe88..86528e8 100644 --- a/Constructor5.Elements/SimFilters/SimFilterMiniEditor.xaml +++ b/Constructor5.Elements/SimFilters/SimFilterMiniEditor.xaml @@ -92,6 +92,8 @@ + + diff --git a/Constructor5.Elements/SituationGoals/Components/SituationGoalPostConditionsComponentEditor.xaml b/Constructor5.Elements/SituationGoals/Components/SituationGoalPostConditionsComponentEditor.xaml index 783a9d7..b956d33 100644 --- a/Constructor5.Elements/SituationGoals/Components/SituationGoalPostConditionsComponentEditor.xaml +++ b/Constructor5.Elements/SituationGoals/Components/SituationGoalPostConditionsComponentEditor.xaml @@ -1,14 +1,15 @@ - + diff --git a/Constructor5.Elements/SituationGoals/SituationGoalTuner.cs b/Constructor5.Elements/SituationGoals/SituationGoalTuner.cs index 9eda3b3..d759ca0 100644 --- a/Constructor5.Elements/SituationGoals/SituationGoalTuner.cs +++ b/Constructor5.Elements/SituationGoals/SituationGoalTuner.cs @@ -10,6 +10,8 @@ public static TuningHeader CreateTuning(SituationGoal element, SituationGoalExpo { var tuning = ElementTuning.Create(element, existingContext?.MultiGeneratorSubTuningName); tuning.InstanceType = "situation_goal"; + tuning.Class = "SituationGoalProxy"; + tuning.Module = "situations.situation_goal_proxy"; var newContext = new SituationGoalExportContext(existingContext) { diff --git a/Constructor5.Elements/SituationGoals/Templates/SituationGoalDefaultTemplate.cs b/Constructor5.Elements/SituationGoals/Templates/SituationGoalDefaultTemplate.cs index 067d38e..710849a 100644 --- a/Constructor5.Elements/SituationGoals/Templates/SituationGoalDefaultTemplate.cs +++ b/Constructor5.Elements/SituationGoals/Templates/SituationGoalDefaultTemplate.cs @@ -1,8 +1,10 @@ +using Constructor5.Base.SelectableObjects; using Constructor5.Core; namespace Constructor5.Elements.SituationGoals.Templates { [XmlSerializerExtraType] + [SelectableObjectType("SituationGoalTemplates", "No Goal Type Set")] public class SituationGoalDefaultTemplate : SituationGoalTemplate { public override string Label => "No Goal Type Set"; diff --git a/Constructor5.Elements/SituationJobs/Components/SituationJobRewardLootItem.cs b/Constructor5.Elements/SituationJobs/Components/SituationJobRewardLootItem.cs index ab08ab3..edad304 100644 --- a/Constructor5.Elements/SituationJobs/Components/SituationJobRewardLootItem.cs +++ b/Constructor5.Elements/SituationJobs/Components/SituationJobRewardLootItem.cs @@ -6,9 +6,10 @@ namespace Constructor5.Elements.SituationJobs.Components [XmlSerializerExtraType] public class SituationJobRewardLootItem : ReferenceListItem { - public bool RunOnNoMedal { get; set; } public bool RunOnBronze { get; set; } - public bool RunOnSilver { get; set; } public bool RunOnGold { get; set; } + public bool RunOnNoMedal { get; set; } + public bool RunOnSilver { get; set; } + // public Reference TargetSimJob { get; set; } = new Reference(); not currently implemented } -} +} \ No newline at end of file diff --git a/Constructor5.Elements/SituationJobs/Components/SituationJobRewardLootItemEditor.xaml b/Constructor5.Elements/SituationJobs/Components/SituationJobRewardLootItemEditor.xaml index 684058a..1df2421 100644 --- a/Constructor5.Elements/SituationJobs/Components/SituationJobRewardLootItemEditor.xaml +++ b/Constructor5.Elements/SituationJobs/Components/SituationJobRewardLootItemEditor.xaml @@ -1,16 +1,21 @@ - + + diff --git a/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponent.cs b/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponent.cs index a291200..befe5ca 100644 --- a/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponent.cs +++ b/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponent.cs @@ -9,15 +9,16 @@ namespace Constructor5.Elements.SituationJobs.Components { [XmlSerializerExtraType] - [HasAutoEditor("SimFilterNotice")] public class SituationJobSimFilterComponent : SituationJobComponent { public override string ComponentLabel => "Filter"; [AutoTuneBasic("filter")] - [AutoEditorReferenceWithEditorUnderneath("SimFilter", ResetTo = 30732, ResetToLabel = "Child to Elder")] public Reference Filter { get; set; } = new Reference() { GameReference = 30732, GameReferenceLabel = "Child to Elder" }; + [AutoTuneBasic("additional_filter_for_user_selection")] + public Reference UserSelectionFilter { get; set; } = new Reference(); + protected internal override void OnExport(SituationJobExportContext context) => AutoTunerInvoker.Invoke(this, context.Tuning); } } diff --git a/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponentEditor.xaml b/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponentEditor.xaml new file mode 100644 index 0000000..1939267 --- /dev/null +++ b/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponentEditor.xaml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponentEditor.xaml.cs b/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponentEditor.xaml.cs new file mode 100644 index 0000000..8a63265 --- /dev/null +++ b/Constructor5.Elements/SituationJobs/Components/SituationJobSimFilterComponentEditor.xaml.cs @@ -0,0 +1,16 @@ +using Constructor5.UI.Shared; +using System.Windows.Controls; + +namespace Constructor5.Elements.SituationJobs.Components +{ + [ObjectEditor(typeof(SituationJobSimFilterComponent))] + public partial class SituationJobSimFilterComponentEditor : UserControl, IObjectEditor + { + public SituationJobSimFilterComponentEditor() => InitializeComponent(); + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + } + } +} \ No newline at end of file diff --git a/Constructor5.Elements/Situations/Components/SituationSuppressAutomaticBronzePythonStep.cs b/Constructor5.Elements/Situations/Components/SituationSuppressAutomaticBronzePythonStep.cs index 69e8887..ea8c929 100644 --- a/Constructor5.Elements/Situations/Components/SituationSuppressAutomaticBronzePythonStep.cs +++ b/Constructor5.Elements/Situations/Components/SituationSuppressAutomaticBronzePythonStep.cs @@ -32,7 +32,9 @@ public override string GetContent() protected List SituationKeys { get; } = new List(); protected override void Cleanup() - { } + { + SituationKeys.Clear(); + } private SituationSuppressAutomaticBronzePythonStep() { diff --git a/Constructor5.Elements/Situations/SituationEditor.xaml b/Constructor5.Elements/Situations/SituationEditor.xaml index 15ed6c2..010cd4c 100644 --- a/Constructor5.Elements/Situations/SituationEditor.xaml +++ b/Constructor5.Elements/Situations/SituationEditor.xaml @@ -1,12 +1,13 @@ - + diff --git a/Constructor5.Elements/Situations/SituationMiniEditor.xaml b/Constructor5.Elements/Situations/SituationMiniEditor.xaml new file mode 100644 index 0000000..36dcd9c --- /dev/null +++ b/Constructor5.Elements/Situations/SituationMiniEditor.xaml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + diff --git a/Constructor5.Elements/Situations/SituationMiniEditor.xaml.cs b/Constructor5.Elements/Situations/SituationMiniEditor.xaml.cs new file mode 100644 index 0000000..7e41aee --- /dev/null +++ b/Constructor5.Elements/Situations/SituationMiniEditor.xaml.cs @@ -0,0 +1,39 @@ +using Constructor5.Elements.Situations.Components; +using Constructor5.UI.Shared; +using System.Windows; +using System.Windows.Controls; + +namespace Constructor5.Elements.Situations +{ + //[ObjectEditor(typeof(Situation), "ElementMini")] + // currently disabled - doesn't work as intended + public partial class SituationMiniEditor : UserControl, IObjectEditor + { + public static readonly DependencyProperty GoaledEventComponentProperty = + DependencyProperty.Register("GoaledEventComponent", typeof(SituationGoaledEventComponent), typeof(SituationMiniEditor), new PropertyMetadata(null)); + + public static readonly DependencyProperty TemplateComponentProperty = + DependencyProperty.Register("TemplateComponent", typeof(SituationTemplateComponent), typeof(SituationMiniEditor), new PropertyMetadata(null)); + + public SituationMiniEditor() => InitializeComponent(); + + public SituationGoaledEventComponent GoaledEventComponent + { + get { return (SituationGoaledEventComponent)GetValue(GoaledEventComponentProperty); } + set { SetValue(GoaledEventComponentProperty, value); } + } + + public SituationTemplateComponent TemplateComponent + { + get { return (SituationTemplateComponent)GetValue(TemplateComponentProperty); } + set { SetValue(TemplateComponentProperty, value); } + } + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + GoaledEventComponent = ((Situation)obj).GetComponent(); + TemplateComponent = ((Situation)obj).GetComponent(); + } + } +} \ No newline at end of file diff --git a/Constructor5.Elements/TestConditions/NoTestConditionSelected.cs b/Constructor5.Elements/TestConditions/NoTestConditionSelected.cs index e740045..6973d32 100644 --- a/Constructor5.Elements/TestConditions/NoTestConditionSelected.cs +++ b/Constructor5.Elements/TestConditions/NoTestConditionSelected.cs @@ -1,9 +1,11 @@ using Constructor5.Base.ExportSystem.Tuning; +using Constructor5.Base.SelectableObjects; using Constructor5.Core; namespace Constructor5.Elements.TestConditions { [XmlSerializerExtraType] + [SelectableObjectType("ObjectiveConditionTypes", "NoTestConditionSelected")] public class NoTestConditionSelected : TestCondition { public NoTestConditionSelected() => GeneratedLabel = "No Condition Selected"; diff --git a/Constructor5.Elements/Traits/Components/TraitOriginControl.xaml b/Constructor5.Elements/Traits/Components/TraitOriginControl.xaml index db4303f..2d9a474 100644 --- a/Constructor5.Elements/Traits/Components/TraitOriginControl.xaml +++ b/Constructor5.Elements/Traits/Components/TraitOriginControl.xaml @@ -1,11 +1,14 @@ - + diff --git a/Constructor5.Elements/Traits/Components/TraitSpecialCasesComponent.cs b/Constructor5.Elements/Traits/Components/TraitSpecialCasesComponent.cs index 4332114..3257684 100644 --- a/Constructor5.Elements/Traits/Components/TraitSpecialCasesComponent.cs +++ b/Constructor5.Elements/Traits/Components/TraitSpecialCasesComponent.cs @@ -2,8 +2,10 @@ using Constructor5.Base.ExportSystem; using Constructor5.Base.ExportSystem.AutoTuners; using Constructor5.Base.ExportSystem.Tuning; +using Constructor5.Base.ExportSystem.Tuning.Utilities; using Constructor5.Base.ExportSystem.TuningActions; using Constructor5.Base.PropertyTypes; +using Constructor5.Base.Python; using Constructor5.Core; using Constructor5.Elements.Buffs.References; @@ -61,6 +63,8 @@ public class TraitSpecialCasesComponent : TraitComponent public string VoiceEffect { get; set; } + public bool IsGlobalTrait { get; set; } + protected internal override void OnExport(TraitExportContext context) { AutoTunerInvoker.Invoke(this, context.Tuning); @@ -72,7 +76,16 @@ protected internal override void OnExport(TraitExportContext context) DataContext = this }); - ((TuningHeader)context.Tuning).SimDataHandler.WriteText(236, Exporter.Current.STBLBuilder.GetKey(TraitOrigin) ?? 0); + if (Exporter.Current.STBLBuilder != null) + { + (context.Tuning).SimDataHandler.WriteText(236, Exporter.Current.STBLBuilder.GetKey(TraitOrigin) ?? 0); + } + + if (IsGlobalTrait) + { + PythonBuilder.AddStep(GlobalTraitPythonStep.Current); + GlobalTraitPythonStep.Current.AddTrait(ElementTuning.GetSingleInstanceKey(Element) ?? 0); + } } } } \ No newline at end of file diff --git a/Constructor5.Elements/Traits/Components/TraitSpecialCasesEditor.xaml b/Constructor5.Elements/Traits/Components/TraitSpecialCasesEditor.xaml index ac98e13..60c51f1 100644 --- a/Constructor5.Elements/Traits/Components/TraitSpecialCasesEditor.xaml +++ b/Constructor5.Elements/Traits/Components/TraitSpecialCasesEditor.xaml @@ -60,6 +60,15 @@ + + + + + + + + + diff --git a/Constructor5.Elements/Traits/Trait.cs b/Constructor5.Elements/Traits/Trait.cs index f08e69c..a2f460f 100644 --- a/Constructor5.Elements/Traits/Trait.cs +++ b/Constructor5.Elements/Traits/Trait.cs @@ -76,7 +76,7 @@ void IExportableElement.OnExport() var alwaysHasContent = SharedBuffTuner.AlwaysHasContent(this); if (buffComponents.Count > 0 || alwaysHasContent) { - var buffTuning = SharedBuffTuner.CreateTuning(this, buffComponents.ToArray(), "Buff"); + var buffTuning = SharedBuffTuner.CreateTuning(this, buffComponents.ToArray(), "Buff", true); var tunableList1 = tuning.Get("buffs"); var tunableTuple1 = tunableList1.Get(null); tunableTuple1.Set("buff_type", buffTuning.InstanceKey.ToString()); diff --git a/Constructor5.Elements/Worlds/World.cs b/Constructor5.Elements/Worlds/World.cs new file mode 100644 index 0000000..1d29ec4 --- /dev/null +++ b/Constructor5.Elements/Worlds/World.cs @@ -0,0 +1,9 @@ +using Constructor5.Base.ElementSystem; + +namespace Constructor5.Elements.Worlds +{ + [ElementTypeData(ElementTypes = new[] { typeof(World) }, PresetFolders = new[] { "Region" })] + public class World : Element + { + } +} \ No newline at end of file diff --git a/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponent.cs b/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponent.cs new file mode 100644 index 0000000..67498be --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponent.cs @@ -0,0 +1,28 @@ +using Constructor5.Base.ElementSystem; +using Constructor5.Base.ExportSystem.Tuning.Utilities; +using Constructor5.Base.Python; +using Constructor5.Core; +using System.Xml.Serialization; + +namespace Constructor5.Elements.ZoneDirectors.Components +{ + [XmlSerializerExtraType] + public class ZoneDirectorMergeComponent : ZoneDirectorComponent + { + [XmlIgnore] + public override int ComponentDisplayOrder => 2; + + public override string ComponentLabel => "ZoneDirectorMerges"; + + public ReferenceList MergeTo { get; set; } = new ReferenceList(); + + protected internal override void OnExport(ZoneDirectorExportContext context) + { + foreach (var key in ElementTuning.GetInstanceKeys(MergeTo)) + { + PythonBuilder.AddStep(MergeZoneDirectorPythonStep.Current); + MergeZoneDirectorPythonStep.Current.Add(key, ElementTuning.GetSingleInstanceKey(context.Element).Value); + } + } + } +} diff --git a/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponentEditor.xaml b/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponentEditor.xaml new file mode 100644 index 0000000..901282b --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponentEditor.xaml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponentEditor.xaml.cs b/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponentEditor.xaml.cs new file mode 100644 index 0000000..ace9139 --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorMergeComponentEditor.xaml.cs @@ -0,0 +1,16 @@ +using Constructor5.UI.Shared; +using System.Windows.Controls; + +namespace Constructor5.Elements.ZoneDirectors.Components +{ + [ObjectEditor(typeof(ZoneDirectorMergeComponent))] + public partial class ZoneDirectorMergeComponentEditor : UserControl, IObjectEditor + { + public ZoneDirectorMergeComponentEditor() => InitializeComponent(); + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + } + } +} \ No newline at end of file diff --git a/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorTemplateComponent.cs b/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorTemplateComponent.cs new file mode 100644 index 0000000..f3bfca8 --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/Components/ZoneDirectorTemplateComponent.cs @@ -0,0 +1,18 @@ +using Constructor5.Core; +using Constructor5.UI.AutoGeneratedEditors; + +namespace Constructor5.Elements.ZoneDirectors.Components +{ + [XmlSerializerExtraType] + [HasAutoEditor] + public class ZoneDirectorTemplateComponent : ZoneDirectorComponent + { + public override int ComponentDisplayOrder => 1; + public override string ComponentLabel => "Content"; + + [AutoEditorSelectableObject("ZoneDirectorTemplates")] + public ZoneDirectorTemplate Template { get; set; } = new DefaultZoneDirectorTemplate(); + + protected internal override void OnExport(ZoneDirectorExportContext context) => Template.OnExport(context); + } +} diff --git a/Constructor5.Elements/ZoneDirectors/DefaultZoneDirectorTemplate.cs b/Constructor5.Elements/ZoneDirectors/DefaultZoneDirectorTemplate.cs new file mode 100644 index 0000000..5b6a9b5 --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/DefaultZoneDirectorTemplate.cs @@ -0,0 +1,16 @@ +using Constructor5.Base.SelectableObjects; +using Constructor5.Core; + +namespace Constructor5.Elements.ZoneDirectors +{ + [SelectableObjectType("ZoneDirectorTemplates", "DefaultZoneDirectorTemplate")] + [XmlSerializerExtraType] + public class DefaultZoneDirectorTemplate : ZoneDirectorTemplate + { + public override string Label => "No Zone Director Type Selected"; + + protected internal override void OnExport(ZoneDirectorExportContext context) + { + } + } +} \ No newline at end of file diff --git a/Constructor5.Elements/ZoneDirectors/ZoneDirector.cs b/Constructor5.Elements/ZoneDirectors/ZoneDirector.cs new file mode 100644 index 0000000..2144458 --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/ZoneDirector.cs @@ -0,0 +1,46 @@ +using Constructor5.Base.ComponentSystem; +using Constructor5.Base.CustomTuning; +using Constructor5.Base.ElementSystem; +using Constructor5.Base.Export; +using Constructor5.Base.ExportSystem.Tuning.Utilities; +using Constructor5.Core; + +namespace Constructor5.Elements.ZoneDirectors +{ + [ElementTypeData("ZoneDirector", true, ElementTypes = new[] { typeof(ZoneDirector) }, PresetFolders = new[] { "ZoneDirector" }, IsRootType = true)] + public class ZoneDirector : SimpleComponentElement, IExportableElement, ISupportsCustomTuning + { + public CustomTuningInfo CustomTuning { get; set; } = new CustomTuningInfo(); + + void IExportableElement.OnExport() + { + var tuning = ElementTuning.Create(this); + tuning.Class = "SchedulingZoneDirector"; + tuning.InstanceType = "zone_director"; + tuning.Module = "venues.scheduling_zone_director"; + + var context = new ZoneDirectorExportContext + { + Element = this, + Tuning = tuning + }; + foreach (var component in Components) + { + component.OnExport(context); + } + + CustomTuningExporter.Export(this, tuning, CustomTuning); + + TuningExport.AddToQueue(tuning); + } + + protected override void OnElementCreatedOrLoaded() + { + base.OnElementCreatedOrLoaded(); + foreach (var type in Reflection.GetSubtypes(typeof(ZoneDirectorComponent))) + { + AddComponent(type); + } + } + } +} diff --git a/Constructor5.Elements/ZoneDirectors/ZoneDirectorComponent.cs b/Constructor5.Elements/ZoneDirectors/ZoneDirectorComponent.cs new file mode 100644 index 0000000..71b4ffb --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/ZoneDirectorComponent.cs @@ -0,0 +1,13 @@ +using Constructor5.Base.ComponentSystem; +using System.Xml.Serialization; + +namespace Constructor5.Elements.ZoneDirectors +{ + public abstract class ZoneDirectorComponent : ElementComponent, IComponentDisplayOrder + { + [XmlIgnore] + public virtual int ComponentDisplayOrder => 10; + + protected internal abstract void OnExport(ZoneDirectorExportContext context); + } +} \ No newline at end of file diff --git a/Constructor5.Elements/ZoneDirectors/ZoneDirectorEditor.xaml b/Constructor5.Elements/ZoneDirectors/ZoneDirectorEditor.xaml new file mode 100644 index 0000000..6630932 --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/ZoneDirectorEditor.xaml @@ -0,0 +1,13 @@ + + + diff --git a/Constructor5.Elements/ZoneDirectors/ZoneDirectorEditor.xaml.cs b/Constructor5.Elements/ZoneDirectors/ZoneDirectorEditor.xaml.cs new file mode 100644 index 0000000..e3d9ef6 --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/ZoneDirectorEditor.xaml.cs @@ -0,0 +1,16 @@ +using Constructor5.UI.Shared; +using System.Windows.Controls; + +namespace Constructor5.Elements.ZoneDirectors +{ + [ObjectEditor(typeof(ZoneDirector))] + public partial class ZoneDirectorEditor : UserControl, IObjectEditor + { + public ZoneDirectorEditor() => InitializeComponent(); + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + } + } +} \ No newline at end of file diff --git a/Constructor5.Elements/ZoneDirectors/ZoneDirectorExportContext.cs b/Constructor5.Elements/ZoneDirectors/ZoneDirectorExportContext.cs new file mode 100644 index 0000000..163a794 --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/ZoneDirectorExportContext.cs @@ -0,0 +1,11 @@ +using Constructor5.Base.ExportSystem.Tuning; +using System.Collections.Generic; + +namespace Constructor5.Elements.ZoneDirectors +{ + public class ZoneDirectorExportContext + { + public ZoneDirector Element { get; set; } + public TuningBase Tuning { get; set; } + } +} diff --git a/Constructor5.Elements/ZoneDirectors/ZoneDirectorTemplate.cs b/Constructor5.Elements/ZoneDirectors/ZoneDirectorTemplate.cs new file mode 100644 index 0000000..2e8debc --- /dev/null +++ b/Constructor5.Elements/ZoneDirectors/ZoneDirectorTemplate.cs @@ -0,0 +1,19 @@ +using Constructor5.Core; +using System.ComponentModel; +using System.Xml.Serialization; + +namespace Constructor5.Elements.ZoneDirectors +{ + [XmlSerializerExtraType] + public abstract class ZoneDirectorTemplate : INotifyPropertyChanged + { +#pragma warning disable CS0067 + public event PropertyChangedEventHandler PropertyChanged; +#pragma warning restore CS0067 + + [XmlIgnore] + public abstract string Label { get; } + + protected internal abstract void OnExport(ZoneDirectorExportContext context); + } +} diff --git a/Constructor5.Elements/packages.config b/Constructor5.Elements/packages.config index 984c770..78d301f 100644 --- a/Constructor5.Elements/packages.config +++ b/Constructor5.Elements/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/Constructor5.InteractionTemplates/Friendly/FriendlySITemplate.cs b/Constructor5.InteractionTemplates/Friendly/FriendlySITemplate.cs index cb19fbf..ca6e848 100644 --- a/Constructor5.InteractionTemplates/Friendly/FriendlySITemplate.cs +++ b/Constructor5.InteractionTemplates/Friendly/FriendlySITemplate.cs @@ -1,10 +1,13 @@ using Constructor5.Base.ElementSystem; +using Constructor5.Base.ExportSystem; using Constructor5.Base.ExportSystem.AutoTuners; using Constructor5.Base.ExportSystem.Tuning; +using Constructor5.Base.ExportSystem.Tuning.Utilities; using Constructor5.Base.Python; using Constructor5.Base.SelectableObjects; using Constructor5.Core; using Constructor5.Elements.Interactions.Shared; +using Constructor5.Elements.Interactions.Social; namespace Constructor5.InteractionTemplates.Friendly { @@ -23,7 +26,7 @@ public class FriendlySITemplate : InteractionTemplate public int MinimumScoreForAvailability { get; set; } [AutoTuneBasic("category")] - public Reference PieMenuCategory { get; set; } = new Reference(15507, "Friendly"); + public override Reference PieMenuCategory { get; set; } = new Reference(308261, "Small Talk"); public int ScoreForFailure { get; set; } = -10; public int ScoreForGreatSuccess { get; set; } = 15; @@ -34,6 +37,14 @@ public class FriendlySITemplate : InteractionTemplate public string TuningActionsFile { get; set; } = "Friendly"; + public override ulong GetCustomScoreTypeKey(InteractionExportContext context) => (ulong)ElementTuning.GetSingleInstanceKey(ScoreType); + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) + { + Exporter.Current.AddError(socialContext.Element, "InteractionAutoScoreTypeError"); + return 249138; + } + protected override void OnExport(InteractionExportContext context) { PythonBuilder.AddStep(SnippetInteractionsPythonStep.Current); diff --git a/Constructor5.InteractionTemplates/Friendly/FriendlySITemplateEditor.xaml b/Constructor5.InteractionTemplates/Friendly/FriendlySITemplateEditor.xaml index 669974f..4924c97 100644 --- a/Constructor5.InteractionTemplates/Friendly/FriendlySITemplateEditor.xaml +++ b/Constructor5.InteractionTemplates/Friendly/FriendlySITemplateEditor.xaml @@ -108,13 +108,16 @@ - - - + + + + + + (ulong)ElementTuning.GetSingleInstanceKey(ScoreType); + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) + { + Exporter.Current.AddError(socialContext.Element, "InteractionAutoScoreTypeError"); + return 24570; + } + protected override void OnExport(InteractionExportContext context) { PythonBuilder.AddStep(SnippetInteractionsPythonStep.Current); diff --git a/Constructor5.InteractionTemplates/Funny/FunnySITemplateEditor.xaml b/Constructor5.InteractionTemplates/Funny/FunnySITemplateEditor.xaml index 292e5e7..3365e91 100644 --- a/Constructor5.InteractionTemplates/Funny/FunnySITemplateEditor.xaml +++ b/Constructor5.InteractionTemplates/Funny/FunnySITemplateEditor.xaml @@ -84,13 +84,16 @@ FontSize="{StaticResource Constructor.BigFontSize}" Header="Advanced"> - - - + + + + + + 0; + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) => 0; + protected override void OnExport(InteractionExportContext context) { AutoTunerInvoker.Invoke(this, context.Tuning); diff --git a/Constructor5.InteractionTemplates/Immediate/ImmediateInteractionTemplateEditor.xaml b/Constructor5.InteractionTemplates/Immediate/ImmediateInteractionTemplateEditor.xaml index 9bb80b0..0e4aee4 100644 --- a/Constructor5.InteractionTemplates/Immediate/ImmediateInteractionTemplateEditor.xaml +++ b/Constructor5.InteractionTemplates/Immediate/ImmediateInteractionTemplateEditor.xaml @@ -22,11 +22,7 @@ - + diff --git a/Constructor5.InteractionTemplates/Mean/MeanSITemplate.cs b/Constructor5.InteractionTemplates/Mean/MeanSITemplate.cs index 64cfd53..246df5c 100644 --- a/Constructor5.InteractionTemplates/Mean/MeanSITemplate.cs +++ b/Constructor5.InteractionTemplates/Mean/MeanSITemplate.cs @@ -1,11 +1,13 @@ using Constructor5.Base.ElementSystem; +using Constructor5.Base.ExportSystem; using Constructor5.Base.ExportSystem.AutoTuners; using Constructor5.Base.ExportSystem.Tuning; -using Constructor5.Base.ExportSystem.TuningActions; +using Constructor5.Base.ExportSystem.Tuning.Utilities; using Constructor5.Base.Python; using Constructor5.Base.SelectableObjects; using Constructor5.Core; using Constructor5.Elements.Interactions.Shared; +using Constructor5.Elements.Interactions.Social; namespace Constructor5.InteractionTemplates.Mean { @@ -22,13 +24,21 @@ public class MeanSITemplate : InteractionTemplate public int MinimumScoreForAvailability { get; set; } [AutoTuneBasic("category")] - public Reference PieMenuCategory { get; set; } = new Reference(15509, "Mean"); + public override Reference PieMenuCategory { get; set; } = new Reference(308252, "Malicious"); public Reference ScoreType { get; set; } = new Reference() { GameReferenceLabel = "Mean", GameReference = 24572 }; public Reference ScoreTypeAvailability { get; set; } = new Reference() { GameReferenceLabel = "Mean", GameReference = 24573 }; public string TuningActionsFile { get; set; } = "Mean"; + public override ulong GetCustomScoreTypeKey(InteractionExportContext context) => (ulong)ElementTuning.GetSingleInstanceKey(ScoreType); + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) + { + Exporter.Current.AddError(socialContext.Element, "InteractionAutoScoreTypeError"); + return 24572; + } + protected override void OnExport(InteractionExportContext context) { PythonBuilder.AddStep(SnippetInteractionsPythonStep.Current); diff --git a/Constructor5.InteractionTemplates/Mean/MeanSITemplateEditor.xaml b/Constructor5.InteractionTemplates/Mean/MeanSITemplateEditor.xaml index 0d6bd73..3a69ded 100644 --- a/Constructor5.InteractionTemplates/Mean/MeanSITemplateEditor.xaml +++ b/Constructor5.InteractionTemplates/Mean/MeanSITemplateEditor.xaml @@ -12,10 +12,7 @@ mc:Ignorable="d"> - + - + - + - + - - - + + + + + + (ulong)ElementTuning.GetSingleInstanceKey(ScoreType); + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) + { + Exporter.Current.AddError(socialContext.Element, "InteractionAutoScoreTypeError"); + return 24574; + } + protected override void OnExport(InteractionExportContext context) { PythonBuilder.AddStep(SnippetInteractionsPythonStep.Current); diff --git a/Constructor5.InteractionTemplates/Mischief/MischiefSITemplateEditor.xaml b/Constructor5.InteractionTemplates/Mischief/MischiefSITemplateEditor.xaml index e852bbe..883cb78 100644 --- a/Constructor5.InteractionTemplates/Mischief/MischiefSITemplateEditor.xaml +++ b/Constructor5.InteractionTemplates/Mischief/MischiefSITemplateEditor.xaml @@ -11,10 +11,7 @@ mc:Ignorable="d"> - + - + - + - + + + + + + + + + + + + + + diff --git a/Constructor5.InteractionTemplates/OneShot/OneShotTemplate.cs b/Constructor5.InteractionTemplates/OneShot/OneShotTemplate.cs index a3a1519..02c359c 100644 --- a/Constructor5.InteractionTemplates/OneShot/OneShotTemplate.cs +++ b/Constructor5.InteractionTemplates/OneShot/OneShotTemplate.cs @@ -3,6 +3,7 @@ using Constructor5.Base.SelectableObjects; using Constructor5.Core; using Constructor5.Elements.Interactions.Shared; +using Constructor5.Elements.Interactions.Social; namespace Constructor5.InteractionTemplates.OneShot { @@ -16,10 +17,14 @@ public class OneShotTemplate : InteractionTemplate public ReferenceList LootActionSets { get; set; } = new ReferenceList(); [AutoTuneBasic("category")] - public Reference PieMenuCategory { get; set; } = new Reference(); + public override Reference PieMenuCategory { get; set; } = new Reference(); public string TuningActionsFile { get; set; } = "OneShot"; + public override ulong GetCustomScoreTypeKey(InteractionExportContext context) => 0; + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) => 0; + protected override void OnExport(InteractionExportContext context) { AutoTunerInvoker.Invoke(this, context.Tuning); diff --git a/Constructor5.InteractionTemplates/Phone/PhoneTemplate.cs b/Constructor5.InteractionTemplates/Phone/PhoneTemplate.cs index 1c0496f..12ddcb7 100644 --- a/Constructor5.InteractionTemplates/Phone/PhoneTemplate.cs +++ b/Constructor5.InteractionTemplates/Phone/PhoneTemplate.cs @@ -3,6 +3,7 @@ using Constructor5.Base.SelectableObjects; using Constructor5.Core; using Constructor5.Elements.Interactions.Shared; +using Constructor5.Elements.Interactions.Social; using System; using System.Collections.Generic; using System.Linq; @@ -21,12 +22,16 @@ public class PhoneTemplate : InteractionTemplate public Reference Animation { get; set; } = new Reference() { GameReference = 11702, GameReferenceLabel = "Chat" }; [AutoTuneBasic("category")] - public Reference PieMenuCategory { get; set; } = new Reference() { GameReference = 105922, GameReferenceLabel = "Home" }; + public override Reference PieMenuCategory { get; set; } = new Reference() { GameReference = 105922, GameReferenceLabel = "Home" }; public bool UsesInternet { get; set; } public string TuningActionsFile { get; set; } = "PhoneInteraction"; + public override ulong GetCustomScoreTypeKey(InteractionExportContext context) => 0; + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) => 0; + protected override void OnExport(InteractionExportContext context) { AutoTunerInvoker.Invoke(this, context.Tuning); diff --git a/Constructor5.InteractionTemplates/Romance/RomanceSITemplate.cs b/Constructor5.InteractionTemplates/Romance/RomanceSITemplate.cs index a2e33bd..7b06b4a 100644 --- a/Constructor5.InteractionTemplates/Romance/RomanceSITemplate.cs +++ b/Constructor5.InteractionTemplates/Romance/RomanceSITemplate.cs @@ -1,11 +1,14 @@ using Constructor5.Base.ElementSystem; +using Constructor5.Base.ExportSystem; using Constructor5.Base.ExportSystem.AutoTuners; using Constructor5.Base.ExportSystem.Tuning; +using Constructor5.Base.ExportSystem.Tuning.Utilities; using Constructor5.Base.ExportSystem.TuningActions; using Constructor5.Base.Python; using Constructor5.Base.SelectableObjects; using Constructor5.Core; using Constructor5.Elements.Interactions.Shared; +using Constructor5.Elements.Interactions.Social; namespace Constructor5.InteractionTemplates.Romance { @@ -21,14 +24,19 @@ public class RomanceSITemplate : InteractionTemplate public ReferenceList LootActionSets { get; set; } = new ReferenceList(); public int MinimumScoreForAvailability { get; set; } - [AutoTuneBasic("category")] - public Reference PieMenuCategory { get; set; } = new Reference(15510, "Romance"); - public Reference ScoreType { get; set; } = new Reference() { GameReferenceLabel = "Romance", GameReference = 24565 }; public Reference ScoreTypeAvailability { get; set; } = new Reference() { GameReferenceLabel = "Romance", GameReference = 24566 }; public string TuningActionsFile { get; set; } = "Romance"; + public override ulong GetCustomScoreTypeKey(InteractionExportContext context) => (ulong)ElementTuning.GetSingleInstanceKey(ScoreType); + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) + { + Exporter.Current.AddError(socialContext.Element, "InteractionAutoScoreTypeError"); + return 24566; + } + protected override void OnExport(InteractionExportContext context) { PythonBuilder.AddStep(SnippetInteractionsPythonStep.Current); diff --git a/Constructor5.InteractionTemplates/Romance/RomanceSITemplateEditor.xaml b/Constructor5.InteractionTemplates/Romance/RomanceSITemplateEditor.xaml index 8bacbd1..0cfe8e3 100644 --- a/Constructor5.InteractionTemplates/Romance/RomanceSITemplateEditor.xaml +++ b/Constructor5.InteractionTemplates/Romance/RomanceSITemplateEditor.xaml @@ -84,13 +84,16 @@ FontSize="{StaticResource Constructor.BigFontSize}" Header="Advanced"> - - - + + + + + + 0; + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) => 0; + protected override void OnExport(InteractionExportContext context) { /*PythonBuilder.AddStep(SnippetInteractionsPythonStep.Current); diff --git a/Constructor5.InteractionTemplates/TraitPicker/TraitPickerInteractionTemplate.cs b/Constructor5.InteractionTemplates/TraitPicker/TraitPickerInteractionTemplate.cs index 4520044..4832c51 100644 --- a/Constructor5.InteractionTemplates/TraitPicker/TraitPickerInteractionTemplate.cs +++ b/Constructor5.InteractionTemplates/TraitPicker/TraitPickerInteractionTemplate.cs @@ -20,14 +20,15 @@ public class TraitPickerInteractionTemplate : InteractionTemplate, IIsImmediateI [AutoTuneIfTrue("only_one_allowed")] public bool OnlyOneAllowed { get; set; } - [AutoTuneBasic("category")] - public Reference PieMenuCategory { get; set; } = new Reference(); - [AutoTuneReferenceList("traits")] public ReferenceList Traits { get; set; } = new ReferenceList(); public string TuningActionsFile { get; set; } = "TraitPickerSuperInteraction"; + public override ulong GetCustomScoreTypeKey(InteractionExportContext context) => 0; + + public override ulong GetFallbackScoreType(SocialInteractionExportContext socialContext) => 0; + protected override void OnExport(InteractionExportContext context) { AutoTunerInvoker.Invoke(this, context.Tuning); diff --git a/Constructor5.SimFilterTypes/IsRoommateFilter.cs b/Constructor5.SimFilterTypes/IsRoommateFilter.cs index 3681852..0152613 100644 --- a/Constructor5.SimFilterTypes/IsRoommateFilter.cs +++ b/Constructor5.SimFilterTypes/IsRoommateFilter.cs @@ -3,7 +3,7 @@ namespace Constructor5.SimFilterTypes { - [SelectableObjectType("SimFilterTypes", "Is Roommate Filter")] + [SelectableObjectType("SimFilterTypes", "IsRoommateFilter")] [XmlSerializerExtraType] public class IsRoommateFilter : InvertOnlyFilter { diff --git a/Constructor5.SimFilterTypes/SkillFilter.cs b/Constructor5.SimFilterTypes/SkillFilter.cs index 0081290..73eab08 100644 --- a/Constructor5.SimFilterTypes/SkillFilter.cs +++ b/Constructor5.SimFilterTypes/SkillFilter.cs @@ -18,16 +18,19 @@ public class SkillFilter : SimFilterTerm { public SkillFilter() => GeneratedLabel = "Skill Filter"; - [AutoTuneBasic("ideal_value")] - public int IdealValue { get; set; } + [AutoTuneBasic("ideal_value", IgnoreIf = -1)] + public int IdealValue { get; set; } = -1; - [AutoTuneBasic("max_value")] - public int MaxValue { get; set; } + [AutoTuneBasic("max_value", IgnoreIf = -1)] + public int MaxValue { get; set; } = -1; - [AutoTuneBasic("min_value")] - public int MinValue { get; set; } + [AutoTuneBasic("min_value", IgnoreIf = -1)] + public int MinValue { get; set; } = -1; - [AutoTuneBasic("statistic")] + public bool IsOptional { get; set; } + + + [AutoTuneBasic("skill")] public Reference Skill { get; set; } = new Reference(); protected override void OnExport(TunableList filterTermsTunable) @@ -35,6 +38,11 @@ protected override void OnExport(TunableList filterTermsTunable) var tunableVariant1 = filterTermsTunable.Set(null, "skill"); var tunableTuple1 = tunableVariant1.Get("skill"); AutoTunerInvoker.Invoke(this, tunableTuple1); + + if (IsOptional) + { + tunableTuple1.Set("minimum_filter_score", "0.1"); + } } } } diff --git a/Constructor5.SimFilterTypes/SkillFilterEditor.xaml b/Constructor5.SimFilterTypes/SkillFilterEditor.xaml index cb5246b..86fb2e5 100644 --- a/Constructor5.SimFilterTypes/SkillFilterEditor.xaml +++ b/Constructor5.SimFilterTypes/SkillFilterEditor.xaml @@ -1,27 +1,43 @@ - + - + - + - - + + + + + + + + diff --git a/Constructor5.SimFilterTypes/TraitFilter.cs b/Constructor5.SimFilterTypes/TraitFilter.cs index 4040637..0aa8b66 100644 --- a/Constructor5.SimFilterTypes/TraitFilter.cs +++ b/Constructor5.SimFilterTypes/TraitFilter.cs @@ -16,6 +16,9 @@ public class TraitFilter : SimFilterTerm [AutoTuneIfTrue("ignore_if_wrong_pack")] public bool IgnoreIfWrongPack { get; set; } + public bool IsOptional { get; set; } + + [AutoTuneBasic("trait")] public Reference Trait { get; set; } = new Reference(); @@ -24,6 +27,11 @@ protected override void OnExport(TunableList filterTermsTunable) var tunableVariant1 = filterTermsTunable.Set(null, "trait"); var tunableTuple1 = tunableVariant1.Get("trait"); AutoTunerInvoker.Invoke(this, tunableTuple1); + + if (IsOptional) + { + tunableTuple1.Set("minimum_filter_score", "0.1"); + } } } } diff --git a/Constructor5.SimFilterTypes/TraitFilterEditor.xaml b/Constructor5.SimFilterTypes/TraitFilterEditor.xaml index 90f3010..abbb73d 100644 --- a/Constructor5.SimFilterTypes/TraitFilterEditor.xaml +++ b/Constructor5.SimFilterTypes/TraitFilterEditor.xaml @@ -1,27 +1,33 @@ - + - + - + + + + + + + diff --git a/Constructor5.SituationTemplates/CareerEventSituation/CareerEventSituationTemplate.cs b/Constructor5.SituationTemplates/CareerEventSituation/CareerEventSituationTemplate.cs index 6afaed7..7999380 100644 --- a/Constructor5.SituationTemplates/CareerEventSituation/CareerEventSituationTemplate.cs +++ b/Constructor5.SituationTemplates/CareerEventSituation/CareerEventSituationTemplate.cs @@ -12,10 +12,10 @@ public class CareerEventSituationTemplate : SituationTemplate { public override string Label => "Career Event Situation"; - // todo: option to remove adult tag + public bool HasAdultTag { get; set; } = true; - public Reference RoleState { get; set; } = new Reference(); - public Reference SituationJob { get; set; } = new Reference(); + public Reference RoleState { get; set; } = new Reference(99710, "Generic"); + public Reference SituationJob { get; set; } = new Reference(99709, "Generic"); protected override void OnExport(SituationExportContext context) { @@ -39,17 +39,20 @@ protected override void OnExport(SituationExportContext context) tunableTuple1.Set("text_ok", "0x520A9B3F"); var tunableVariant5 = tunableTuple1.Set("title", "enabled"); tunableVariant5.Set("enabled", "0xBE9B7DC1"); - var tunableList2 = tunableTuple1.Get("ui_responses"); + tunableTuple1.Get("ui_responses"); var tunableVariant6 = context.Tuning.Set("situation_end_time_string", "show_end_time"); tunableVariant6.Set("show_end_time", "0xA3E17143"); var tunableList3 = context.Tuning.Get("tags"); tunableList3.Set(null, "Situation_ActiveCareer"); - tunableList3.Set(null, "Situation_ActiveCareer_Adult"); + if (HasAdultTag) + { + tunableList3.Set(null, "Situation_ActiveCareer_Adult"); + } var tunableTuple3 = context.Tuning.Get("travel_request_behavior"); var tunableVariant7 = tunableTuple3.Set("dialog", "enabled"); var tunableTuple4 = tunableVariant7.Get("enabled"); var tunableVariant8 = tunableTuple4.Set("icon", "enabled"); - var tunableVariant9 = tunableVariant8.Set("enabled", "participant"); + tunableVariant8.Set("enabled", "participant"); var tunableVariant10 = tunableTuple4.Set("text", "single"); tunableVariant10.Set("single", "0xA19B9708"); var tunableVariant11 = tunableTuple4.Set("title", "enabled"); diff --git a/Constructor5.SituationTemplates/CareerEventSituation/CareerEventSituationTemplateEditor.xaml b/Constructor5.SituationTemplates/CareerEventSituation/CareerEventSituationTemplateEditor.xaml index c6e11ea..7444909 100644 --- a/Constructor5.SituationTemplates/CareerEventSituation/CareerEventSituationTemplateEditor.xaml +++ b/Constructor5.SituationTemplates/CareerEventSituation/CareerEventSituationTemplateEditor.xaml @@ -15,6 +15,8 @@ CreateElementFunction="ReferenceControl_CreateElementFunction" ElementTypeName="SituationJob" Reference="{Binding SituationJob}" + ResetTo="99709" + ResetToLabel="Generic" ShowBrowseButton="True" ShowCreateButton="True" /> @@ -22,6 +24,8 @@ diff --git a/Constructor5.TestConditionTypes/Constructor5.TestConditionTypes.csproj b/Constructor5.TestConditionTypes/Constructor5.TestConditionTypes.csproj index 190a11e..7f86641 100644 --- a/Constructor5.TestConditionTypes/Constructor5.TestConditionTypes.csproj +++ b/Constructor5.TestConditionTypes/Constructor5.TestConditionTypes.csproj @@ -192,6 +192,12 @@ + + + LotInfoConditionEditor.xaml + + + @@ -438,6 +444,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/Constructor5.TestConditionTypes/Locations/LocationCondition.cs b/Constructor5.TestConditionTypes/Locations/LocationCondition.cs index e3d17d5..dc0a742 100644 --- a/Constructor5.TestConditionTypes/Locations/LocationCondition.cs +++ b/Constructor5.TestConditionTypes/Locations/LocationCondition.cs @@ -9,7 +9,7 @@ namespace Constructor5.TestConditionTypes.Locations { - [SelectableObjectType("TestConditionTypes", "LocationCondition")] + [SelectableObjectType("TestConditionTypes", "LocationCondition", Description = "LocationConditionDescription")] //[SelectableObjectType("SituationGoalConditionTypes", "LocationCondition")] [XmlSerializerExtraType] public class LocationCondition : TestCondition diff --git a/Constructor5.TestConditionTypes/Locations/LotInfoCondition.cs b/Constructor5.TestConditionTypes/Locations/LotInfoCondition.cs new file mode 100644 index 0000000..8dd3344 --- /dev/null +++ b/Constructor5.TestConditionTypes/Locations/LotInfoCondition.cs @@ -0,0 +1,111 @@ +using Constructor5.Base.ElementSystem; +using Constructor5.Base.ExportSystem.AutoTuners; +using Constructor5.Base.ExportSystem.Tuning; +using Constructor5.Base.ExportSystem.Tuning.Utilities; +using Constructor5.Base.SelectableObjects; +using Constructor5.Core; +using Constructor5.Elements.TestConditions; +using System; + +namespace Constructor5.TestConditionTypes.Locations +{ + [SelectableObjectType("TestConditionTypes", "LotInfoCondition", Description = "LotInfoConditionDescription")] + //[SelectableObjectType("SituationGoalConditionTypes", "LocationCondition")] + [XmlSerializerExtraType] + public class LotInfoCondition : TestCondition + { + public LotInfoCondition() => GeneratedLabel = "Lot Info Condition"; + + //public LotInfoSource Source { get; set; } = LotInfoSource.CurrentLot; + + public ReferenceList LotTypeBlacklist { get; set; } = new ReferenceList(); + public ReferenceList LotTypeWhitelist { get; set; } = new ReferenceList(); + + public ReferenceList LotTraitBlacklist { get; set; } = new ReferenceList(); + public ReferenceList LotTraitWhitelist { get; set; } = new ReferenceList(); + + public ReferenceList WorldBlacklist { get; set; } = new ReferenceList(); + public ReferenceList WorldWhitelist { get; set; } = new ReferenceList(); + + public LotInfoYesNoAny IsApartment { get; set; } = LotInfoYesNoAny.Any; + public LotInfoYesNoAny IsPenthouse { get; set; } = LotInfoYesNoAny.Any; + + public bool UseParentLot { get; set; } + + protected override string GetVariantTunableName(string contextTag = null) => "zone"; + + protected override void OnExportVariant(TunableBase variantTunable, string contextTag) + { + //tupleTunable.Set("", "REPLACE WITH ZONE SOURCE"); + + var tupleTunable = variantTunable.Get("zone"); + var zoneTestsTuple = tupleTunable.Get("zone_tests"); + + TuneYesNoAny(zoneTestsTuple, IsApartment, "is_apartment", "Is_or_is_not_apartment_zone"); + TuneIsPenthouse(zoneTestsTuple); + + zoneTestsTuple.Set("use_source_venue", UseParentLot); + + TuneList(zoneTestsTuple, LotTypeBlacklist, LotTypeWhitelist, "venue_type"); + TuneList(zoneTestsTuple, WorldBlacklist, WorldWhitelist, "world_tests"); + TuneList(zoneTestsTuple, LotTraitBlacklist, LotTraitWhitelist, "zone_modifiers"); + + } + + private void TuneList(TunableTuple tuning, ReferenceList blacklist, ReferenceList whitelist, string tunableName) + { + if (blacklist.HasItems() || whitelist.HasItems()) + { + var tunableVariant1 = tuning.Set(tunableName, "enabled"); + var tunableTuple2 = tunableVariant1.Get("enabled"); + + if (blacklist.HasItems()) + { + var tunableVariant2 = tunableTuple2.Set("blacklist", "specify"); + var tunableTuple3 = tunableVariant2.Get("specify"); + var tunableList1 = tunableTuple3.Get("blacklist"); + foreach(var item in ElementTuning.GetInstanceKeys(blacklist)) + { + tunableList1.Set(null, item); + } + } + + if (whitelist.HasItems()) + { + var tunableVariant3 = tunableTuple2.Set("whitelist", "specify"); + var tunableTuple4 = tunableVariant3.Get("specify"); + var tunableList2 = tunableTuple4.Get("whitelist"); + foreach (var item in ElementTuning.GetInstanceKeys(whitelist)) + { + tunableList2.Set(null, item); + } + } + } + } + + private void TuneIsPenthouse(TunableTuple zoneTestsTuple) + { + if (IsPenthouse == LotInfoYesNoAny.Any) + { + return; + } + + var tunableVariant1 = zoneTestsTuple.Set("is_penthouse", "enabled"); + tunableVariant1.Set("enabled", IsPenthouse == LotInfoYesNoAny.Yes ? "True" : "False"); + } + + private void TuneYesNoAny(TuningBase tuning, LotInfoYesNoAny yesNoAny, string tunableName, string variantName) + { + if (yesNoAny == LotInfoYesNoAny.Any) + { + return; + } + + var tunableVariant2 = tuning.Set(tunableName, variantName); + if (yesNoAny == LotInfoYesNoAny.No) + { + tunableVariant2.Set(variantName, "False"); + } + } + } +} diff --git a/Constructor5.TestConditionTypes/Locations/LotInfoConditionEditor.xaml b/Constructor5.TestConditionTypes/Locations/LotInfoConditionEditor.xaml new file mode 100644 index 0000000..3220630 --- /dev/null +++ b/Constructor5.TestConditionTypes/Locations/LotInfoConditionEditor.xaml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Constructor5.TestConditionTypes/Locations/LotInfoConditionEditor.xaml.cs b/Constructor5.TestConditionTypes/Locations/LotInfoConditionEditor.xaml.cs new file mode 100644 index 0000000..d5a599c --- /dev/null +++ b/Constructor5.TestConditionTypes/Locations/LotInfoConditionEditor.xaml.cs @@ -0,0 +1,16 @@ +using Constructor5.UI.Shared; +using System.Windows.Controls; + +namespace Constructor5.TestConditionTypes.Locations +{ + [ObjectEditor(typeof(LotInfoCondition))] + public partial class LotInfoConditionEditor : UserControl, IObjectEditor + { + public LotInfoConditionEditor() => InitializeComponent(); + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + } + } +} \ No newline at end of file diff --git a/Constructor5.TestConditionTypes/Locations/LotInfoSource.cs b/Constructor5.TestConditionTypes/Locations/LotInfoSource.cs new file mode 100644 index 0000000..d36b64a --- /dev/null +++ b/Constructor5.TestConditionTypes/Locations/LotInfoSource.cs @@ -0,0 +1,8 @@ +namespace Constructor5.TestConditionTypes.Locations +{ + public enum LotInfoSource + { + CurrentLot, + ActiveHouseholdHomeLot + } +} diff --git a/Constructor5.TestConditionTypes/Locations/LotInfoYesNoAny.cs b/Constructor5.TestConditionTypes/Locations/LotInfoYesNoAny.cs new file mode 100644 index 0000000..1ce40eb --- /dev/null +++ b/Constructor5.TestConditionTypes/Locations/LotInfoYesNoAny.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Constructor5.TestConditionTypes.Locations +{ + public enum LotInfoYesNoAny + { + Yes, + No, + Any + } +} diff --git a/Constructor5.UI/Constructor5.UI.csproj b/Constructor5.UI/Constructor5.UI.csproj index bcaa945..433d9a2 100644 --- a/Constructor5.UI/Constructor5.UI.csproj +++ b/Constructor5.UI/Constructor5.UI.csproj @@ -55,7 +55,7 @@ - ..\packages\gong-wpf-dragdrop.3.1.1\lib\net48\GongSolutions.WPF.DragDrop.dll + ..\packages\gong-wpf-dragdrop.3.2.1\lib\net48\GongSolutions.WPF.DragDrop.dll ..\packages\AvalonEdit.6.1.3.50\lib\net45\ICSharpCode.AvalonEdit.dll diff --git a/Constructor5.UI/packages.config b/Constructor5.UI/packages.config index 760aa3c..a14b8f5 100644 --- a/Constructor5.UI/packages.config +++ b/Constructor5.UI/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/Constructor5.ZoneDirectorTemplates.csproj b/Constructor5.ZoneDirectorTemplates/Constructor5.ZoneDirectorTemplates.csproj new file mode 100644 index 0000000..b156aa9 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/Constructor5.ZoneDirectorTemplates.csproj @@ -0,0 +1,150 @@ + + + + + Debug + AnyCPU + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2} + library + Constructor5.ZoneDirectorTemplates + Constructor5.ZoneDirectorTemplates + v4.8 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + + + + ..\packages\gong-wpf-dragdrop.3.2.1\lib\net48\GongSolutions.WPF.DragDrop.dll + + + + + + + + + + + 4.0 + + + + + + ..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.dll + + + ..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + + + ..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + + + ..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + + + ..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.Toolkit.dll + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + + ScheduledSituationEditor.xaml + + + + + ShiftBasedZoneDirectorEditor.xaml + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + {f6468a79-3da7-4f70-878b-d3c47e67294e} + Constructor5.Base + + + {c0f0f8a5-0f1d-47ca-a3d9-a58042374574} + Constructor5.Core + + + {8cdaf7b3-75c2-4365-a29e-ba5d85bc24eb} + Constructor5.Elements + + + {92267ec9-b06a-44ac-b383-f40c4d6a5755} + Constructor5.UI + + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/Properties/AssemblyInfo.cs b/Constructor5.ZoneDirectorTemplates/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..9624947 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Constructor5.ZoneDirectorTemplates")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Constructor5.ZoneDirectorTemplates")] +[assembly: AssemblyCopyright("Copyright © 2023")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly:ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Constructor5.ZoneDirectorTemplates/Properties/Resources.Designer.cs b/Constructor5.ZoneDirectorTemplates/Properties/Resources.Designer.cs new file mode 100644 index 0000000..3026b59 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/Properties/Resources.Designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Constructor5.ZoneDirectorTemplates.Properties { + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if ((resourceMan == null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Constructor5.ZoneDirectorTemplates.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Constructor5.ZoneDirectorTemplates/Properties/Resources.resx b/Constructor5.ZoneDirectorTemplates/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/Properties/Settings.Designer.cs b/Constructor5.ZoneDirectorTemplates/Properties/Settings.Designer.cs new file mode 100644 index 0000000..986178d --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Constructor5.ZoneDirectorTemplates.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/Constructor5.ZoneDirectorTemplates/Properties/Settings.settings b/Constructor5.ZoneDirectorTemplates/Properties/Settings.settings new file mode 100644 index 0000000..033d7a5 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/ScheduledShift.cs b/Constructor5.ZoneDirectorTemplates/ScheduledShift.cs new file mode 100644 index 0000000..275210b --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/ScheduledShift.cs @@ -0,0 +1,25 @@ +using Constructor5.Base.ElementSystem; +using System.Collections.ObjectModel; + +namespace Constructor5.ZoneDirectorTemplates +{ + public class ScheduledShift + { + public bool Allow0Sunday { get; set; } = true; + public bool Allow1Monday { get; set; } = true; + public bool Allow2Tuesday { get; set; } = true; + public bool Allow3Wednesday { get; set; } = true; + public bool Allow4Thursday { get; set; } = true; + public bool Allow5Friday { get; set; } = true; + public bool Allow6Saturday { get; set; } = true; + public string Label { get; set; } = "Shift"; + public ObservableCollection ObjectBasedMultiplierTags { get; set; } = new ObservableCollection(); + public bool ObjectBasedMultiplier { get; set; } + public int StartObjectBasedMultiplierFrom { get; set; } = 1; + public int ObjectBasedMultiplierIterations { get; set; } = 1; + public int ObjectBasedMultiplierMax { get; set; } = 10; + public bool Overlap { get; set; } + public ObservableCollection SpawnTimes { get; } = new ObservableCollection(); + public ReferenceList Situations { get; set; } = new ReferenceList(); + } +} \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/ScheduledShiftSpawnTime.cs b/Constructor5.ZoneDirectorTemplates/ScheduledShiftSpawnTime.cs new file mode 100644 index 0000000..0322eb8 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/ScheduledShiftSpawnTime.cs @@ -0,0 +1,12 @@ +using Constructor5.Core; + +namespace Constructor5.ZoneDirectorTemplates +{ + [XmlSerializerExtraType] + public class ScheduledShiftSpawnTime + { + public int MaxAmount { get; set; } = 1; + public int MinAmount { get; set; } + public int StartHour { get; set; } + } +} \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/ScheduledSituation.cs b/Constructor5.ZoneDirectorTemplates/ScheduledSituation.cs new file mode 100644 index 0000000..b72d599 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/ScheduledSituation.cs @@ -0,0 +1,13 @@ +using Constructor5.Base.ElementSystem; +using Constructor5.Core; +using Constructor5.Elements.TestConditions; + +namespace Constructor5.ZoneDirectorTemplates +{ + [XmlSerializerExtraType] + public class ScheduledSituation : ReferenceListItem + { + public int Weight { get; set; } = 1; + public TestConditionList Conditions { get; set; } = new TestConditionList(); + } +} \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/ScheduledSituationEditor.xaml b/Constructor5.ZoneDirectorTemplates/ScheduledSituationEditor.xaml new file mode 100644 index 0000000..fddb9fd --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/ScheduledSituationEditor.xaml @@ -0,0 +1,22 @@ + + + + + + + + + + diff --git a/Constructor5.ZoneDirectorTemplates/ScheduledSituationEditor.xaml.cs b/Constructor5.ZoneDirectorTemplates/ScheduledSituationEditor.xaml.cs new file mode 100644 index 0000000..e87db24 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/ScheduledSituationEditor.xaml.cs @@ -0,0 +1,16 @@ +using Constructor5.UI.Shared; +using System.Windows.Controls; + +namespace Constructor5.ZoneDirectorTemplates +{ + [ObjectEditor(typeof(ScheduledSituation))] + public partial class ScheduledSituationEditor : UserControl, IObjectEditor + { + public ScheduledSituationEditor() => InitializeComponent(); + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + } + } +} \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/SchedulingExportContext.cs b/Constructor5.ZoneDirectorTemplates/SchedulingExportContext.cs new file mode 100644 index 0000000..3e29325 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/SchedulingExportContext.cs @@ -0,0 +1,69 @@ +using System.Collections.Generic; + +namespace Constructor5.ZoneDirectorTemplates +{ + public class SchedulingExportContext + { + public List MergedShiftSets { get; } = new List(); + + public MergedShiftSet GetMergedShiftSet(ScheduledShift shift) + { + var canMerge = false; //!shift.ObjectBasedMultiplier; + + if (canMerge) + { + foreach (var shiftSet in MergedShiftSets) + { + if ( + shiftSet.CanMerge && + shift.Allow0Sunday && shiftSet.Allow0Sunday + && shift.Allow1Monday && shiftSet.Allow1Monday + && shift.Allow2Tuesday && shiftSet.Allow2Tuesday + && shift.Allow3Wednesday && shiftSet.Allow3Wednesday + && shift.Allow4Thursday && shiftSet.Allow4Thursday + && shift.Allow5Friday && shiftSet.Allow5Friday + && shift.Allow6Saturday && shiftSet.Allow6Saturday + && shift.Overlap + ) + { + if (!shiftSet.IncludedShifts.Contains(shift)) + { + shiftSet.IncludedShifts.Add(shift); + } + return shiftSet; + } + } + } + + var newSet = new MergedShiftSet + { + Allow0Sunday = shift.Allow0Sunday, + Allow1Monday = shift.Allow1Monday, + Allow2Tuesday = shift.Allow2Tuesday, + Allow3Wednesday = shift.Allow3Wednesday, + Allow4Thursday = shift.Allow4Thursday, + Allow5Friday = shift.Allow5Friday, + Allow6Saturday = shift.Allow6Saturday, + CanMerge = canMerge, + Overlap = shift.Overlap + }; + newSet.IncludedShifts.Add(shift); + MergedShiftSets.Add(newSet); + return newSet; + } + + public class MergedShiftSet + { + public bool Allow0Sunday { get; set; } = true; + public bool Allow1Monday { get; set; } = true; + public bool Allow2Tuesday { get; set; } = true; + public bool Allow3Wednesday { get; set; } = true; + public bool Allow4Thursday { get; set; } = true; + public bool Allow5Friday { get; set; } = true; + public bool Allow6Saturday { get; set; } = true; + public bool CanMerge { get; set; } + public List IncludedShifts { get; } = new List(); + public bool Overlap { get; set; } + } + } +} diff --git a/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirector.cs b/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirector.cs new file mode 100644 index 0000000..b790a14 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirector.cs @@ -0,0 +1,170 @@ +using Constructor5.Base.ExportSystem.Tuning; +using Constructor5.Base.ExportSystem.Tuning.Utilities; +using Constructor5.Base.SelectableObjects; +using Constructor5.Core; +using Constructor5.Elements.TestConditions; +using Constructor5.Elements.ZoneDirectors; +using System.Collections.ObjectModel; + +namespace Constructor5.ZoneDirectorTemplates +{ + [SelectableObjectType("ZoneDirectorTemplates", "ShiftBasedZoneDirector")] + [XmlSerializerExtraType] + public class ShiftBasedZoneDirector : ZoneDirectorTemplate + { + public override string Label => "Shift-Based Zone Director"; + + public ObservableCollection Shifts { get; } = new ObservableCollection(); + + protected override void OnExport(ZoneDirectorExportContext context) + { + var additionalContext = new SchedulingExportContext(); + foreach (var shift in Shifts) + { + additionalContext.GetMergedShiftSet(shift); + } + + var tunableList1 = context.Tuning.Get("situation_shifts"); + foreach (var shift in additionalContext.MergedShiftSets) + { + TuneShift(context, shift, tunableList1); + } + } + + private void TuneObjectMultipliers(ScheduledShift shift, TunableTuple curveBased) + { + var tunableTuple1 = curveBased.Get("desired_sim_count_multipliers"); + var tunableList1 = tunableTuple1.Get("multipliers"); + + void Tune(int objectAmount, int multiplierAmount) + { + if (multiplierAmount == 1) + { + return; + } + + var tunableTuple2 = tunableList1.Get(null); + tunableTuple2.Set("multiplier", multiplierAmount); + var tunableList2 = tunableTuple2.Get("tests"); + var tunableList3 = tunableList2.Get(null); + var tunableVariant1 = tunableList3.Set(null, "object_criteria"); + var tunableTuple3 = tunableVariant1.Get("object_criteria"); + var tunableVariant2 = tunableTuple3.Set("identity_test", "tags"); + var tunableTuple4 = tunableVariant2.Get("tags"); + var tunableList4 = tunableTuple4.Get("tag_set"); + + foreach (string tag in shift.ObjectBasedMultiplierTags) + { + tunableList4.Set(null, tag); + } + + tunableTuple3.Set("on_active_lot", "True"); + tunableTuple3.Set("owned", "False"); + var tunableVariant3 = tunableTuple3.Set("subject_specific_tests", "all_objects"); + var tunableTuple5 = tunableVariant3.Get("all_objects"); + var tunableTuple6 = tunableTuple5.Get("quantity"); + if (multiplierAmount == shift.ObjectBasedMultiplierMax) + { + tunableTuple6.Set("comparison", "GREATER_OR_EQUAL"); + } + else if (objectAmount == shift.StartObjectBasedMultiplierFrom-1) + { + tunableTuple6.Set("comparison", "LESS_OR_EQUAL"); + } + else + { + tunableTuple6.Set("comparison", "EQUAL"); + } + + tunableTuple6.Set("value", objectAmount); + } + + Tune(shift.StartObjectBasedMultiplierFrom-1, 0); + + var totalIndex = 1; + for (int i = 1; i <= shift.ObjectBasedMultiplierMax; i++) + { + for (int instance = 1; instance <= shift.ObjectBasedMultiplierIterations; instance++) + { + Tune(totalIndex + shift.StartObjectBasedMultiplierFrom-1, i); + totalIndex++; + } + } + } + + private void TuneShift(ZoneDirectorExportContext context, SchedulingExportContext.MergedShiftSet shiftSet, TunableList shiftsList) + { + var shiftTuple = shiftsList.Get(null); + + var tunableVariant1 = shiftTuple.Set("shift_curve", "curve_based"); + var curveBased = tunableVariant1.Get("curve_based"); + + var entriesList = curveBased.Get("entries"); + { + var tunableTuple1 = entriesList.Get(null); + var tunableTuple2 = tunableTuple1.Get("days_of_the_week"); + tunableTuple2.Set("0 SUNDAY", shiftSet.Allow0Sunday); + tunableTuple2.Set("1 MONDAY", shiftSet.Allow1Monday); + tunableTuple2.Set("2 TUESDAY", shiftSet.Allow2Tuesday); + tunableTuple2.Set("3 WEDNESDAY", shiftSet.Allow3Wednesday); + tunableTuple2.Set("4 THURSDAY", shiftSet.Allow4Thursday); + tunableTuple2.Set("5 FRIDAY", shiftSet.Allow5Friday); + tunableTuple2.Set("6 SATURDAY", shiftSet.Allow6Saturday); + var tunableList1 = tunableTuple1.Get("walkby_desire_by_time_of_day"); + + foreach (var shift in shiftSet.IncludedShifts) + { + foreach (var spawnTime in shift.SpawnTimes) + { + var tunableTuple3 = tunableList1.Get(null); + tunableTuple3.Set("hour_of_day", spawnTime.StartHour); + var tunableTuple4 = tunableTuple3.Get("desired_walkby_situations"); + + if (spawnTime.MinAmount == spawnTime.MaxAmount) + { + var simCountVariant = tunableTuple4.Set("desired_sim_count", "literal"); + var simCountTuple = simCountVariant.Get("literal"); + simCountTuple.Set("value", spawnTime.MinAmount); + } + else + { + var simCountVariant = tunableTuple4.Set("desired_sim_count", "random_in_range"); + var simCountTuple = simCountVariant.Get("random_in_range"); + if (spawnTime.MinAmount != 0) + { + simCountTuple.Set("lower_bound", spawnTime.MinAmount); + } + + simCountTuple.Set("upper_bound", spawnTime.MaxAmount); + } + + var tunableList2 = tunableTuple4.Get("weighted_situations"); + + foreach (var situation in shift.Situations.GetOfType()) + { + foreach (var situationKey in ElementTuning.GetInstanceKeys(situation.Reference)) + { + var tunableTuple6 = tunableList2.Get(null); + tunableTuple6.Set("situation", situationKey); + if (situation.Weight != 1) + { + tunableTuple6.Set("weight", situation.Weight); + } + TestConditionTuning.TuneTestList(tunableTuple6, situation.Conditions.ToConditionList(), "tests"); + } + } + } + + if (shift.ObjectBasedMultiplier) + { + TuneObjectMultipliers(shift, curveBased); + } + } + } + + if (shiftSet.Overlap) + { + shiftTuple.Set("shift_strictness", "OVERLAP"); + } } + } +} \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirectorEditor.xaml b/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirectorEditor.xaml new file mode 100644 index 0000000..91b78f1 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirectorEditor.xaml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirectorEditor.xaml.cs b/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirectorEditor.xaml.cs new file mode 100644 index 0000000..0252984 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/ShiftBasedZoneDirectorEditor.xaml.cs @@ -0,0 +1,16 @@ +using Constructor5.UI.Shared; +using System.Windows.Controls; + +namespace Constructor5.ZoneDirectorTemplates +{ + [ObjectEditor(typeof(ShiftBasedZoneDirector))] + public partial class ShiftBasedZoneDirectorEditor : UserControl, IObjectEditor + { + public ShiftBasedZoneDirectorEditor() => InitializeComponent(); + + void IObjectEditor.SetObject(object obj, string tag) + { + DataContext = obj; + } + } +} \ No newline at end of file diff --git a/Constructor5.ZoneDirectorTemplates/packages.config b/Constructor5.ZoneDirectorTemplates/packages.config new file mode 100644 index 0000000..9d80cd3 --- /dev/null +++ b/Constructor5.ZoneDirectorTemplates/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Constructor5.sln b/Constructor5.sln index c6b063e..8741ad6 100644 --- a/Constructor5.sln +++ b/Constructor5.sln @@ -47,6 +47,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Base", "Base", "{C3675B6A-6 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Constructor5.BasicExtraTypes", "Constructor5.BasicExtraTypes\Constructor5.BasicExtraTypes.csproj", "{84E6323C-12A8-47DC-A68D-00717A38CE4A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Constructor5.ZoneDirectorTemplates", "Constructor5.ZoneDirectorTemplates\Constructor5.ZoneDirectorTemplates.csproj", "{3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -183,6 +185,14 @@ Global {84E6323C-12A8-47DC-A68D-00717A38CE4A}.Release|Any CPU.Build.0 = Release|Any CPU {84E6323C-12A8-47DC-A68D-00717A38CE4A}.Release|x64.ActiveCfg = Release|x64 {84E6323C-12A8-47DC-A68D-00717A38CE4A}.Release|x64.Build.0 = Release|x64 + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}.Debug|x64.ActiveCfg = Debug|x64 + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}.Debug|x64.Build.0 = Debug|x64 + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}.Release|Any CPU.Build.0 = Release|Any CPU + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}.Release|x64.ActiveCfg = Release|Any CPU + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -206,6 +216,7 @@ Global {090CD6DE-565B-48D6-B61D-C708379C076A} = {02BDAF7E-804E-4BFC-821D-C4DD63D84586} {700DFCB4-4735-4094-B0BD-33752C946A11} = {52B09123-8EC1-4E5A-A2F4-8DCDD656AC5F} {84E6323C-12A8-47DC-A68D-00717A38CE4A} = {090CD6DE-565B-48D6-B61D-C708379C076A} + {3DCE553C-BE93-4464-BE28-29C1A3BFD0C2} = {090CD6DE-565B-48D6-B61D-C708379C076A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C7BFE636-B571-4472-A775-50917DF7D61F} diff --git a/Constructor5/Constructor5.csproj b/Constructor5/Constructor5.csproj index 9e66428..6a42818 100644 --- a/Constructor5/Constructor5.csproj +++ b/Constructor5/Constructor5.csproj @@ -2311,9 +2311,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -3339,6 +3336,10 @@ {92267ec9-b06a-44ac-b383-f40c4d6a5755} Constructor5.UI + + {3dce553c-be93-4464-be28-29c1a3bfd0c2} + Constructor5.ZoneDirectorTemplates + @@ -3442,7 +3443,7 @@ - PreserveNewest + Always @@ -4045,6 +4046,191 @@ PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + diff --git a/Constructor5/Presets/Animation/AllAnimationsBG.Presets.xml b/Constructor5/Presets/Animation/AllAnimationsBG.Presets.xml index 77f694e..5cbdf8d 100644 --- a/Constructor5/Presets/Animation/AllAnimationsBG.Presets.xml +++ b/Constructor5/Presets/Animation/AllAnimationsBG.Presets.xml @@ -1002,7 +1002,6 @@ - @@ -1237,7 +1236,7 @@ - + @@ -1245,7 +1244,7 @@ - + @@ -1268,7 +1267,7 @@ - + @@ -1359,7 +1358,7 @@ - + @@ -1382,7 +1381,7 @@ - + @@ -1400,6 +1399,9 @@ + + + @@ -1456,7 +1458,7 @@ - + @@ -1624,10 +1626,23 @@ + + + + + + + + + + + + + @@ -1635,16 +1650,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1652,7 +1778,22 @@ + + + + + + + + + + + + + + + @@ -1661,32 +1802,104 @@ + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1700,11 +1913,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1712,12 +2114,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1725,11 +2344,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Animation/AllAnimationsEP04.Presets.xml b/Constructor5/Presets/Animation/AllAnimationsEP04.Presets.xml index 5668f10..36d0547 100644 --- a/Constructor5/Presets/Animation/AllAnimationsEP04.Presets.xml +++ b/Constructor5/Presets/Animation/AllAnimationsEP04.Presets.xml @@ -518,5 +518,6 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Animation/AllAnimationsGP05.Presets.xml b/Constructor5/Presets/Animation/AllAnimationsGP05.Presets.xml index 54c0c3c..a1d76fd 100644 --- a/Constructor5/Presets/Animation/AllAnimationsGP05.Presets.xml +++ b/Constructor5/Presets/Animation/AllAnimationsGP05.Presets.xml @@ -103,4 +103,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Animation/AllAnimationsSP12.Presets.xml b/Constructor5/Presets/Animation/AllAnimationsSP12.Presets.xml index b787cc4..9cb3ccc 100644 --- a/Constructor5/Presets/Animation/AllAnimationsSP12.Presets.xml +++ b/Constructor5/Presets/Animation/AllAnimationsSP12.Presets.xml @@ -6,7 +6,6 @@ - @@ -30,8 +29,6 @@ - - diff --git a/Constructor5/Presets/AspirationCategory/AllAspirationCategoriesBG.Presets.xml b/Constructor5/Presets/AspirationCategory/AllAspirationCategoriesBG.Presets.xml index 6756866..4c7d61a 100644 --- a/Constructor5/Presets/AspirationCategory/AllAspirationCategoriesBG.Presets.xml +++ b/Constructor5/Presets/AspirationCategory/AllAspirationCategoriesBG.Presets.xml @@ -23,4 +23,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/AspirationTrack/AllAspirationTracksBG.Presets.xml b/Constructor5/Presets/AspirationTrack/AllAspirationTracksBG.Presets.xml index c697f91..78eccb3 100644 --- a/Constructor5/Presets/AspirationTrack/AllAspirationTracksBG.Presets.xml +++ b/Constructor5/Presets/AspirationTrack/AllAspirationTracksBG.Presets.xml @@ -36,6 +36,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Balloon/AllBalloonSetsBG.Presets.xml b/Constructor5/Presets/Balloon/AllBalloonSetsBG.Presets.xml index bba25bd..021041a 100644 --- a/Constructor5/Presets/Balloon/AllBalloonSetsBG.Presets.xml +++ b/Constructor5/Presets/Balloon/AllBalloonSetsBG.Presets.xml @@ -357,11 +357,53 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Balloon/AllBalloonSetsEP01.Presets.xml b/Constructor5/Presets/Balloon/AllBalloonSetsEP01.Presets.xml index 7ea5ba4..d2a3e34 100644 --- a/Constructor5/Presets/Balloon/AllBalloonSetsEP01.Presets.xml +++ b/Constructor5/Presets/Balloon/AllBalloonSetsEP01.Presets.xml @@ -38,4 +38,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Balloon/AllBalloonSetsEP10.Presets.xml b/Constructor5/Presets/Balloon/AllBalloonSetsEP10.Presets.xml index 4196c8f..533fa2f 100644 --- a/Constructor5/Presets/Balloon/AllBalloonSetsEP10.Presets.xml +++ b/Constructor5/Presets/Balloon/AllBalloonSetsEP10.Presets.xml @@ -26,4 +26,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Balloon/AllBalloonSetsGP06.Presets.xml b/Constructor5/Presets/Balloon/AllBalloonSetsGP06.Presets.xml index 40359df..ee8e55e 100644 --- a/Constructor5/Presets/Balloon/AllBalloonSetsGP06.Presets.xml +++ b/Constructor5/Presets/Balloon/AllBalloonSetsGP06.Presets.xml @@ -8,4 +8,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Balloon/AllBalloonSetsGP07.Presets.xml b/Constructor5/Presets/Balloon/AllBalloonSetsGP07.Presets.xml index 919a2fe..267cf93 100644 --- a/Constructor5/Presets/Balloon/AllBalloonSetsGP07.Presets.xml +++ b/Constructor5/Presets/Balloon/AllBalloonSetsGP07.Presets.xml @@ -6,4 +6,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Broadcaster/AllBroadcastersBG.Presets.xml b/Constructor5/Presets/Broadcaster/AllBroadcastersBG.Presets.xml index 55d0d81..c921888 100644 --- a/Constructor5/Presets/Broadcaster/AllBroadcastersBG.Presets.xml +++ b/Constructor5/Presets/Broadcaster/AllBroadcastersBG.Presets.xml @@ -134,6 +134,7 @@ + @@ -170,13 +171,34 @@ + + + + + + + + + + + + + + + + + + + + + @@ -185,9 +207,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/BucksPerk/AllPerksBG.Presets.xml b/Constructor5/Presets/BucksPerk/AllPerksBG.Presets.xml index 203db08..25e8219 100644 --- a/Constructor5/Presets/BucksPerk/AllPerksBG.Presets.xml +++ b/Constructor5/Presets/BucksPerk/AllPerksBG.Presets.xml @@ -1,4 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsBG.Presets.xml b/Constructor5/Presets/Buff/AllBuffsBG.Presets.xml index 888beaa..773d400 100644 --- a/Constructor5/Presets/Buff/AllBuffsBG.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsBG.Presets.xml @@ -2095,7 +2095,7 @@ - + @@ -2553,8 +2553,11 @@ + + + @@ -2653,8 +2656,8 @@ - - + + @@ -3134,6 +3137,7 @@ + @@ -3146,9 +3150,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3166,6 +3217,7 @@ + @@ -3205,6 +3257,7 @@ + @@ -3223,10 +3276,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3234,11 +3325,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3264,6 +3406,7 @@ + @@ -3334,16 +3477,39 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -3378,9 +3544,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3414,32 +3623,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3449,13 +3741,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3464,11 +3790,30 @@ + + + + + + + + + + + + + + + + + + + @@ -3494,33 +3839,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3533,6 +3992,8 @@ + + @@ -3630,27 +4091,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3659,6 +4347,7 @@ + @@ -3668,121 +4357,1003 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + @@ -3797,17 +5368,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsEP03.Presets.xml b/Constructor5/Presets/Buff/AllBuffsEP03.Presets.xml index 88f5231..86b8b70 100644 --- a/Constructor5/Presets/Buff/AllBuffsEP03.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsEP03.Presets.xml @@ -498,4 +498,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsEP05.Presets.xml b/Constructor5/Presets/Buff/AllBuffsEP05.Presets.xml index 07011b0..adad16f 100644 --- a/Constructor5/Presets/Buff/AllBuffsEP05.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsEP05.Presets.xml @@ -316,7 +316,7 @@ - + @@ -371,4 +371,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsEP06.Presets.xml b/Constructor5/Presets/Buff/AllBuffsEP06.Presets.xml index 81a44b9..dd88515 100644 --- a/Constructor5/Presets/Buff/AllBuffsEP06.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsEP06.Presets.xml @@ -602,4 +602,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsEP07.Presets.xml b/Constructor5/Presets/Buff/AllBuffsEP07.Presets.xml index c9080dc..99673b9 100644 --- a/Constructor5/Presets/Buff/AllBuffsEP07.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsEP07.Presets.xml @@ -328,4 +328,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsEP08.Presets.xml b/Constructor5/Presets/Buff/AllBuffsEP08.Presets.xml index c2614c4..0ef76fc 100644 --- a/Constructor5/Presets/Buff/AllBuffsEP08.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsEP08.Presets.xml @@ -520,4 +520,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsEP10.Presets.xml b/Constructor5/Presets/Buff/AllBuffsEP10.Presets.xml index 8d4a371..d6b0091 100644 --- a/Constructor5/Presets/Buff/AllBuffsEP10.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsEP10.Presets.xml @@ -741,4 +741,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsGP02.Presets.xml b/Constructor5/Presets/Buff/AllBuffsGP02.Presets.xml index 5e62a13..6286167 100644 --- a/Constructor5/Presets/Buff/AllBuffsGP02.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsGP02.Presets.xml @@ -623,4 +623,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsGP05.Presets.xml b/Constructor5/Presets/Buff/AllBuffsGP05.Presets.xml index 614cad9..2a198cf 100644 --- a/Constructor5/Presets/Buff/AllBuffsGP05.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsGP05.Presets.xml @@ -268,4 +268,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsGP10.Presets.xml b/Constructor5/Presets/Buff/AllBuffsGP10.Presets.xml index f078293..10938b9 100644 --- a/Constructor5/Presets/Buff/AllBuffsGP10.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsGP10.Presets.xml @@ -126,4 +126,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Buff/AllBuffsSP12.Presets.xml b/Constructor5/Presets/Buff/AllBuffsSP12.Presets.xml index 0d779fd..bdc06f6 100644 --- a/Constructor5/Presets/Buff/AllBuffsSP12.Presets.xml +++ b/Constructor5/Presets/Buff/AllBuffsSP12.Presets.xml @@ -6,9 +6,6 @@ - - - diff --git a/Constructor5/Presets/Buff/AutonomyBuffs.Presets.xml b/Constructor5/Presets/Buff/AutonomyBuffs.Presets.xml index 2ca87c4..4341bcd 100644 --- a/Constructor5/Presets/Buff/AutonomyBuffs.Presets.xml +++ b/Constructor5/Presets/Buff/AutonomyBuffs.Presets.xml @@ -160,10 +160,30 @@ + + + + + + + + + + + + + + + + + + + + @@ -355,18 +375,6 @@ - - - - - - - - - - - - diff --git a/Constructor5/Presets/Buff/RoleBuffs.Presets.xml b/Constructor5/Presets/Buff/RoleBuffs.Presets.xml index f8fcf70..787bc93 100644 --- a/Constructor5/Presets/Buff/RoleBuffs.Presets.xml +++ b/Constructor5/Presets/Buff/RoleBuffs.Presets.xml @@ -105,13 +105,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217,8 +243,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -475,78 +566,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -613,23 +632,6 @@ - - - - - - - - - - - - - - - - - diff --git a/Constructor5/Presets/CareerGig/AllCareerGigsSP18.Presets.xml b/Constructor5/Presets/CareerGig/AllCareerGigsSP18.Presets.xml index 41e3c3d..c809eb5 100644 --- a/Constructor5/Presets/CareerGig/AllCareerGigsSP18.Presets.xml +++ b/Constructor5/Presets/CareerGig/AllCareerGigsSP18.Presets.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Constructor5/Presets/Commodity/AllCommoditiesBG.Presets.xml b/Constructor5/Presets/Commodity/AllCommoditiesBG.Presets.xml index 0b9289d..0ff21ef 100644 --- a/Constructor5/Presets/Commodity/AllCommoditiesBG.Presets.xml +++ b/Constructor5/Presets/Commodity/AllCommoditiesBG.Presets.xml @@ -486,23 +486,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -513,8 +562,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Commodity/AllCommoditiesEP04.Presets.xml b/Constructor5/Presets/Commodity/AllCommoditiesEP04.Presets.xml index f7ecf7e..b214cd0 100644 --- a/Constructor5/Presets/Commodity/AllCommoditiesEP04.Presets.xml +++ b/Constructor5/Presets/Commodity/AllCommoditiesEP04.Presets.xml @@ -208,4 +208,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Commodity/Autonomy.Presets.xml b/Constructor5/Presets/Commodity/Autonomy.Presets.xml index 01e081a..c00e34f 100644 --- a/Constructor5/Presets/Commodity/Autonomy.Presets.xml +++ b/Constructor5/Presets/Commodity/Autonomy.Presets.xml @@ -58,6 +58,9 @@ + + + @@ -107,9 +110,6 @@ - - - diff --git a/Constructor5/Presets/CommodityBasedObjectStateValue/AllCommodityBasedObjectStateValuesBG.Presets.xml b/Constructor5/Presets/CommodityBasedObjectStateValue/AllCommodityBasedObjectStateValuesBG.Presets.xml index 6129e8f..6f85a48 100644 --- a/Constructor5/Presets/CommodityBasedObjectStateValue/AllCommodityBasedObjectStateValuesBG.Presets.xml +++ b/Constructor5/Presets/CommodityBasedObjectStateValue/AllCommodityBasedObjectStateValuesBG.Presets.xml @@ -579,12 +579,17 @@ + + + + + @@ -592,15 +597,29 @@ + + + + + + + + + + + + + + @@ -610,6 +629,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -621,9 +662,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsBG.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsBG.Presets.xml index a938b0f..42c145c 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsBG.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsBG.Presets.xml @@ -166,16 +166,8 @@ - - - - - - - - @@ -1993,7 +1985,6 @@ - @@ -2446,7 +2437,6 @@ - @@ -3702,8 +3692,8 @@ - - + + @@ -3793,7 +3783,7 @@ - + @@ -3808,10 +3798,10 @@ - + - + @@ -3847,10 +3837,10 @@ - + - + @@ -3875,7 +3865,7 @@ - + @@ -3918,11 +3908,11 @@ - - + + - + @@ -3936,8 +3926,8 @@ - - + + @@ -4015,13 +4005,13 @@ - - - + + + - - + + @@ -4033,8 +4023,8 @@ - - + + @@ -4065,8 +4055,8 @@ - - + + @@ -4079,8 +4069,8 @@ - - + + @@ -4145,7 +4135,7 @@ - + @@ -4157,7 +4147,7 @@ - + @@ -4187,7 +4177,7 @@ - + @@ -4196,12 +4186,11 @@ - - - + + - + @@ -4216,7 +4205,7 @@ - + @@ -4235,7 +4224,7 @@ - + @@ -4486,7 +4475,7 @@ - + @@ -4496,7 +4485,7 @@ - + @@ -4514,9 +4503,9 @@ - - - + + + @@ -4582,15 +4571,26 @@ + + + + + + + + + + + @@ -4654,9 +4654,9 @@ - - - + + + @@ -4823,7 +4823,7 @@ - + @@ -5079,7 +5079,7 @@ - + @@ -5570,23 +5570,43 @@ + + + + + + + + + + + + + + + + + + + + @@ -5604,6 +5624,7 @@ + @@ -5650,17 +5671,25 @@ + + + + + + + + @@ -5672,6 +5701,7 @@ + @@ -5689,13 +5719,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5706,51 +5761,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5758,15 +6172,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5798,12 +6299,17 @@ + + + + + @@ -5856,11 +6362,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5921,10 +6465,24 @@ + + + + + + + + + + + + + + @@ -5987,17 +6545,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6031,12 +6726,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6068,15 +6893,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6084,6 +6958,11 @@ + + + + + @@ -6106,6 +6985,8 @@ + + @@ -6122,8 +7003,22 @@ + + + + + + + + + + + + + + @@ -6134,13 +7029,22 @@ + + + + + + + + + @@ -6153,24 +7057,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6183,50 +7163,696 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6249,16 +7875,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6267,17 +8004,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6286,13 +8048,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6302,8 +8314,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6312,72 +8490,937 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsEP01.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsEP01.Presets.xml index 44b0a73..f20719f 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsEP01.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsEP01.Presets.xml @@ -938,4 +938,8 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsEP02.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsEP02.Presets.xml index ddf90a4..ec74778 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsEP02.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsEP02.Presets.xml @@ -266,7 +266,6 @@ - diff --git a/Constructor5/Presets/Interaction/AllInteractionsEP04.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsEP04.Presets.xml index c7a33e1..6f1ad92 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsEP04.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsEP04.Presets.xml @@ -640,7 +640,7 @@ - + @@ -2115,6 +2115,20 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsEP05.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsEP05.Presets.xml index 68770a7..5d06060 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsEP05.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsEP05.Presets.xml @@ -846,5 +846,10 @@ + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsEP07.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsEP07.Presets.xml index 5f292e0..8c98b04 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsEP07.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsEP07.Presets.xml @@ -623,4 +623,7 @@ + + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsEP08.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsEP08.Presets.xml index 09044a2..d93ccd5 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsEP08.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsEP08.Presets.xml @@ -1363,4 +1363,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsGP01.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsGP01.Presets.xml index 722d9d3..a2ab1fc 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsGP01.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsGP01.Presets.xml @@ -174,4 +174,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsGP05.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsGP05.Presets.xml index b2fc237..c09f097 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsGP05.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsGP05.Presets.xml @@ -72,7 +72,7 @@ - + @@ -442,4 +442,8 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsGP09.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsGP09.Presets.xml index 5a8513c..85bd68c 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsGP09.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsGP09.Presets.xml @@ -1038,4 +1038,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsGP10.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsGP10.Presets.xml index 84630a5..b77b7f5 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsGP10.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsGP10.Presets.xml @@ -115,21 +115,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -215,4 +215,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsSP07.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsSP07.Presets.xml index 619b606..74f8314 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsSP07.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsSP07.Presets.xml @@ -297,4 +297,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsSP12.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsSP12.Presets.xml index 345246b..1b8e1db 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsSP12.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsSP12.Presets.xml @@ -1,8 +1,5 @@ - - - @@ -10,7 +7,6 @@ - @@ -44,23 +40,16 @@ - - - - - - - \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsSP13.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsSP13.Presets.xml index ea14802..1e2d28a 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsSP13.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsSP13.Presets.xml @@ -123,4 +123,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Interaction/AllInteractionsSP17.Presets.xml b/Constructor5/Presets/Interaction/AllInteractionsSP17.Presets.xml index 70a3f88..5f72428 100644 --- a/Constructor5/Presets/Interaction/AllInteractionsSP17.Presets.xml +++ b/Constructor5/Presets/Interaction/AllInteractionsSP17.Presets.xml @@ -39,7 +39,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -96,8 +96,8 @@ - - + + \ No newline at end of file diff --git a/Constructor5/Presets/InteractionList/AllInteractionListsBG.Presets.xml b/Constructor5/Presets/InteractionList/AllInteractionListsBG.Presets.xml index 5f9bcca..0e5bfc1 100644 --- a/Constructor5/Presets/InteractionList/AllInteractionListsBG.Presets.xml +++ b/Constructor5/Presets/InteractionList/AllInteractionListsBG.Presets.xml @@ -162,14 +162,35 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsBG.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsBG.Presets.xml index 712061f..6f4d1d3 100644 --- a/Constructor5/Presets/Loot/AllLootActionsBG.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsBG.Presets.xml @@ -2449,7 +2449,6 @@ - @@ -2569,7 +2568,7 @@ - + @@ -2788,9 +2787,14 @@ + + + + + @@ -3098,7 +3102,7 @@ - + @@ -3768,6 +3772,7 @@ + @@ -3813,10 +3818,14 @@ + + + + @@ -3834,10 +3843,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3845,18 +3889,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3866,28 +3999,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3939,16 +4229,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3980,11 +4315,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4012,14 +4425,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4052,6 +4576,14 @@ + + + + + + + + @@ -4071,98 +4603,516 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4170,9 +5120,17 @@ + + + + + + + + @@ -4182,12 +5140,18 @@ + + + + + + @@ -4201,20 +5165,30 @@ + + + + + + + + + + @@ -4222,6 +5196,22 @@ + + + + + + + + + + + + + + + + @@ -4231,44 +5221,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4281,37 +5366,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4319,49 +5532,355 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4375,6 +5894,7 @@ + @@ -4385,17 +5905,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4403,24 +5961,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4430,37 +6314,550 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4474,43 +6871,355 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + - @@ -4520,86 +7229,200 @@ + + + + + + + + + + + + + + + - - + + + + + + + + + - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - + + + + + + + + + + + + @@ -4613,28 +7436,359 @@ + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP01.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP01.Presets.xml index e4d08d9..451a4bc 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP01.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP01.Presets.xml @@ -609,4 +609,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP02.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP02.Presets.xml index 01a7f62..d727e4a 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP02.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP02.Presets.xml @@ -250,4 +250,10 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP03.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP03.Presets.xml index 2418dc2..82c9bde 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP03.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP03.Presets.xml @@ -693,4 +693,8 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP04.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP04.Presets.xml index 7425f3c..15ca5a4 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP04.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP04.Presets.xml @@ -830,4 +830,8 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP06.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP06.Presets.xml index 0fc61c2..116fcce 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP06.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP06.Presets.xml @@ -1023,4 +1023,8 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP07.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP07.Presets.xml index 2592a4b..d642cce 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP07.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP07.Presets.xml @@ -472,4 +472,8 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP08.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP08.Presets.xml index 6011317..d7bdf21 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP08.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP08.Presets.xml @@ -1180,4 +1180,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP09.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP09.Presets.xml index 3248258..4497ea5 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP09.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP09.Presets.xml @@ -579,4 +579,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsEP10.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsEP10.Presets.xml index b914eaa..6db05f0 100644 --- a/Constructor5/Presets/Loot/AllLootActionsEP10.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsEP10.Presets.xml @@ -806,4 +806,12 @@ + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsGP01.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsGP01.Presets.xml index b5db7be..fcb7848 100644 --- a/Constructor5/Presets/Loot/AllLootActionsGP01.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsGP01.Presets.xml @@ -150,4 +150,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsGP02.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsGP02.Presets.xml index 8b02f18..73a6672 100644 --- a/Constructor5/Presets/Loot/AllLootActionsGP02.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsGP02.Presets.xml @@ -246,4 +246,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsGP04.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsGP04.Presets.xml index c21e6cc..d169077 100644 --- a/Constructor5/Presets/Loot/AllLootActionsGP04.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsGP04.Presets.xml @@ -203,4 +203,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsGP05.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsGP05.Presets.xml index 219b25f..ca4c89e 100644 --- a/Constructor5/Presets/Loot/AllLootActionsGP05.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsGP05.Presets.xml @@ -486,4 +486,7 @@ + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsGP07.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsGP07.Presets.xml index a8df1ac..c5cf330 100644 --- a/Constructor5/Presets/Loot/AllLootActionsGP07.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsGP07.Presets.xml @@ -277,4 +277,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsGP10.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsGP10.Presets.xml index 3e50d63..9865af6 100644 --- a/Constructor5/Presets/Loot/AllLootActionsGP10.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsGP10.Presets.xml @@ -146,4 +146,10 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsSP12.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsSP12.Presets.xml index 6cf226d..48de9b2 100644 --- a/Constructor5/Presets/Loot/AllLootActionsSP12.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsSP12.Presets.xml @@ -2,16 +2,11 @@ - - - - - \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsSP13.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsSP13.Presets.xml index c532ed8..2758fe0 100644 --- a/Constructor5/Presets/Loot/AllLootActionsSP13.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsSP13.Presets.xml @@ -39,4 +39,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/AllLootActionsSP17.Presets.xml b/Constructor5/Presets/Loot/AllLootActionsSP17.Presets.xml index d7a32b6..96f74cb 100644 --- a/Constructor5/Presets/Loot/AllLootActionsSP17.Presets.xml +++ b/Constructor5/Presets/Loot/AllLootActionsSP17.Presets.xml @@ -52,4 +52,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Loot/CareerDailyTasks.Presets.xml b/Constructor5/Presets/Loot/CareerDailyTasks.Presets.xml index 2356f4f..e1f0f74 100644 --- a/Constructor5/Presets/Loot/CareerDailyTasks.Presets.xml +++ b/Constructor5/Presets/Loot/CareerDailyTasks.Presets.xml @@ -24,6 +24,10 @@ + + + + @@ -75,8 +79,4 @@ - - - - \ No newline at end of file diff --git a/Constructor5/Presets/Loot/CharacterValues.Presets.xml b/Constructor5/Presets/Loot/CharacterValues.Presets.xml index 1923c09..b73f9df 100644 --- a/Constructor5/Presets/Loot/CharacterValues.Presets.xml +++ b/Constructor5/Presets/Loot/CharacterValues.Presets.xml @@ -4,6 +4,12 @@ + + + + + + @@ -11,12 +17,6 @@ - - - - - - diff --git a/Constructor5/Presets/Loot/RelationshipGain.Presets.xml b/Constructor5/Presets/Loot/RelationshipGain.Presets.xml index 04b3048..ce60dc7 100644 --- a/Constructor5/Presets/Loot/RelationshipGain.Presets.xml +++ b/Constructor5/Presets/Loot/RelationshipGain.Presets.xml @@ -196,32 +196,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + @@ -383,40 +432,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -439,10 +454,6 @@ - - - - diff --git a/Constructor5/Presets/Loot/Reputation.Presets.xml b/Constructor5/Presets/Loot/Reputation.Presets.xml index 6dfd4e9..26761c6 100644 --- a/Constructor5/Presets/Loot/Reputation.Presets.xml +++ b/Constructor5/Presets/Loot/Reputation.Presets.xml @@ -3,6 +3,13 @@ + + + + + + + @@ -173,13 +180,6 @@ - - - - - - - diff --git a/Constructor5/Presets/MixerInteraction/AllMixerInteractionsBG.Presets.xml b/Constructor5/Presets/MixerInteraction/AllMixerInteractionsBG.Presets.xml index 91a5ba6..3a85c61 100644 --- a/Constructor5/Presets/MixerInteraction/AllMixerInteractionsBG.Presets.xml +++ b/Constructor5/Presets/MixerInteraction/AllMixerInteractionsBG.Presets.xml @@ -524,6 +524,7 @@ + @@ -603,13 +604,27 @@ + + + + + + + + + + + + + + @@ -641,6 +656,9 @@ + + + @@ -766,8 +784,15 @@ + + + + + + + @@ -783,7 +808,16 @@ + + + + + + + + + @@ -791,21 +825,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/MixerInteraction/AllMixerInteractionsEP07.Presets.xml b/Constructor5/Presets/MixerInteraction/AllMixerInteractionsEP07.Presets.xml index a2dee50..72f2850 100644 --- a/Constructor5/Presets/MixerInteraction/AllMixerInteractionsEP07.Presets.xml +++ b/Constructor5/Presets/MixerInteraction/AllMixerInteractionsEP07.Presets.xml @@ -78,4 +78,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/MixerInteraction/AllMixerInteractionsGP10.Presets.xml b/Constructor5/Presets/MixerInteraction/AllMixerInteractionsGP10.Presets.xml index adb2c32..d4323ca 100644 --- a/Constructor5/Presets/MixerInteraction/AllMixerInteractionsGP10.Presets.xml +++ b/Constructor5/Presets/MixerInteraction/AllMixerInteractionsGP10.Presets.xml @@ -37,4 +37,10 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/MixerInteraction/AllMixerInteractionsSP12.Presets.xml b/Constructor5/Presets/MixerInteraction/AllMixerInteractionsSP12.Presets.xml index c3bc3c5..75e16b5 100644 --- a/Constructor5/Presets/MixerInteraction/AllMixerInteractionsSP12.Presets.xml +++ b/Constructor5/Presets/MixerInteraction/AllMixerInteractionsSP12.Presets.xml @@ -30,7 +30,6 @@ - \ No newline at end of file diff --git a/Constructor5/Presets/Object/AllObjectsBG.Presets.xml b/Constructor5/Presets/Object/AllObjectsBG.Presets.xml index 50e1399..b9127be 100644 --- a/Constructor5/Presets/Object/AllObjectsBG.Presets.xml +++ b/Constructor5/Presets/Object/AllObjectsBG.Presets.xml @@ -1242,7 +1242,7 @@ - + @@ -1603,25 +1603,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1632,20 +1786,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1677,26 +1912,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1704,23 +2043,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1738,7 +2241,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Object/AllObjectsGP09.Presets.xml b/Constructor5/Presets/Object/AllObjectsGP09.Presets.xml index 7c78e3a..a4c1d3c 100644 --- a/Constructor5/Presets/Object/AllObjectsGP09.Presets.xml +++ b/Constructor5/Presets/Object/AllObjectsGP09.Presets.xml @@ -141,4 +141,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Object/AllObjectsGP10.Presets.xml b/Constructor5/Presets/Object/AllObjectsGP10.Presets.xml index 20beb1f..c829ee4 100644 --- a/Constructor5/Presets/Object/AllObjectsGP10.Presets.xml +++ b/Constructor5/Presets/Object/AllObjectsGP10.Presets.xml @@ -30,4 +30,8 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Object/AllObjectsSP04.Presets.xml b/Constructor5/Presets/Object/AllObjectsSP04.Presets.xml index 54c006e..57f2066 100644 --- a/Constructor5/Presets/Object/AllObjectsSP04.Presets.xml +++ b/Constructor5/Presets/Object/AllObjectsSP04.Presets.xml @@ -19,4 +19,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Object/AllObjectsSP12.Presets.xml b/Constructor5/Presets/Object/AllObjectsSP12.Presets.xml index c55530f..0e2e836 100644 --- a/Constructor5/Presets/Object/AllObjectsSP12.Presets.xml +++ b/Constructor5/Presets/Object/AllObjectsSP12.Presets.xml @@ -1,6 +1,5 @@ - diff --git a/Constructor5/Presets/ObjectTag/BuildCategoryTags.Presets.xml b/Constructor5/Presets/ObjectTag/BuildCategoryTags.Presets.xml index 035473d..6e5b463 100644 --- a/Constructor5/Presets/ObjectTag/BuildCategoryTags.Presets.xml +++ b/Constructor5/Presets/ObjectTag/BuildCategoryTags.Presets.xml @@ -171,4 +171,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/ObjectTag/BuyCategoryTags.Presets.xml b/Constructor5/Presets/ObjectTag/BuyCategoryTags.Presets.xml index 268cd75..d16a68b 100644 --- a/Constructor5/Presets/ObjectTag/BuyCategoryTags.Presets.xml +++ b/Constructor5/Presets/ObjectTag/BuyCategoryTags.Presets.xml @@ -237,4 +237,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/ObjectTag/FunctionTags.Presets.xml b/Constructor5/Presets/ObjectTag/FunctionTags.Presets.xml index 56d35bd..cbec405 100644 --- a/Constructor5/Presets/ObjectTag/FunctionTags.Presets.xml +++ b/Constructor5/Presets/ObjectTag/FunctionTags.Presets.xml @@ -943,6 +943,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1190,10 +1218,6 @@ - - - - @@ -1829,4 +1853,22 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesBG.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesBG.Presets.xml index 7ec948a..56b8acd 100644 --- a/Constructor5/Presets/Objective/AllObjectivesBG.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesBG.Presets.xml @@ -463,7 +463,7 @@ - + @@ -977,10 +977,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesEP02.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesEP02.Presets.xml index 93a2ad8..a772e01 100644 --- a/Constructor5/Presets/Objective/AllObjectivesEP02.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesEP02.Presets.xml @@ -25,4 +25,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesEP03.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesEP03.Presets.xml index 50c921a..8880006 100644 --- a/Constructor5/Presets/Objective/AllObjectivesEP03.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesEP03.Presets.xml @@ -230,4 +230,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesEP04.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesEP04.Presets.xml index a0e36ce..0fdd599 100644 --- a/Constructor5/Presets/Objective/AllObjectivesEP04.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesEP04.Presets.xml @@ -101,4 +101,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesEP05.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesEP05.Presets.xml index 2da4d5f..adad23c 100644 --- a/Constructor5/Presets/Objective/AllObjectivesEP05.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesEP05.Presets.xml @@ -92,4 +92,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesEP06.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesEP06.Presets.xml index 82affc6..c6f876a 100644 --- a/Constructor5/Presets/Objective/AllObjectivesEP06.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesEP06.Presets.xml @@ -41,4 +41,7 @@ + + + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesEP07.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesEP07.Presets.xml index d50fd83..b6519e9 100644 --- a/Constructor5/Presets/Objective/AllObjectivesEP07.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesEP07.Presets.xml @@ -57,4 +57,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesEP09.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesEP09.Presets.xml index 6f66304..193ffda 100644 --- a/Constructor5/Presets/Objective/AllObjectivesEP09.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesEP09.Presets.xml @@ -66,4 +66,7 @@ + + + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesEP10.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesEP10.Presets.xml index 154a09c..1c8d2f9 100644 --- a/Constructor5/Presets/Objective/AllObjectivesEP10.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesEP10.Presets.xml @@ -27,4 +27,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesGP04.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesGP04.Presets.xml index 5f56a70..e85a278 100644 --- a/Constructor5/Presets/Objective/AllObjectivesGP04.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesGP04.Presets.xml @@ -40,4 +40,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesGP06.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesGP06.Presets.xml index 83ee42b..ebd25a3 100644 --- a/Constructor5/Presets/Objective/AllObjectivesGP06.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesGP06.Presets.xml @@ -35,4 +35,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesGP07.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesGP07.Presets.xml index 7d058dd..9832406 100644 --- a/Constructor5/Presets/Objective/AllObjectivesGP07.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesGP07.Presets.xml @@ -31,4 +31,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesGP08.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesGP08.Presets.xml index 25b8235..2796284 100644 --- a/Constructor5/Presets/Objective/AllObjectivesGP08.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesGP08.Presets.xml @@ -19,4 +19,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesGP09.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesGP09.Presets.xml index 505a218..e9b904b 100644 --- a/Constructor5/Presets/Objective/AllObjectivesGP09.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesGP09.Presets.xml @@ -203,4 +203,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Objective/AllObjectivesSP17.Presets.xml b/Constructor5/Presets/Objective/AllObjectivesSP17.Presets.xml index 36b465f..8914919 100644 --- a/Constructor5/Presets/Objective/AllObjectivesSP17.Presets.xml +++ b/Constructor5/Presets/Objective/AllObjectivesSP17.Presets.xml @@ -15,4 +15,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/ObjectiveSet/AllObjectiveSetsBG.Presets.xml b/Constructor5/Presets/ObjectiveSet/AllObjectiveSetsBG.Presets.xml index 342ae76..a47bc59 100644 --- a/Constructor5/Presets/ObjectiveSet/AllObjectiveSetsBG.Presets.xml +++ b/Constructor5/Presets/ObjectiveSet/AllObjectiveSetsBG.Presets.xml @@ -581,15 +581,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -603,6 +669,7 @@ + @@ -617,15 +684,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ObjectivelessWhimSet/AllSimpleWantSetsBG.Presets.xml b/Constructor5/Presets/ObjectivelessWhimSet/AllSimpleWantSetsBG.Presets.xml index e8f81bb..c87fc34 100644 --- a/Constructor5/Presets/ObjectivelessWhimSet/AllSimpleWantSetsBG.Presets.xml +++ b/Constructor5/Presets/ObjectivelessWhimSet/AllSimpleWantSetsBG.Presets.xml @@ -88,6 +88,7 @@ + @@ -105,12 +106,28 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Outfit/AllOutfitsBG.Presets.xml b/Constructor5/Presets/Outfit/AllOutfitsBG.Presets.xml index f95f38c..d81b816 100644 --- a/Constructor5/Presets/Outfit/AllOutfitsBG.Presets.xml +++ b/Constructor5/Presets/Outfit/AllOutfitsBG.Presets.xml @@ -194,6 +194,8 @@ + + @@ -206,5 +208,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/PieMenuCategory/AllPieMenuCategoriesBG.Presets.xml b/Constructor5/Presets/PieMenuCategory/AllPieMenuCategoriesBG.Presets.xml index 036a7bf..b48ecdb 100644 --- a/Constructor5/Presets/PieMenuCategory/AllPieMenuCategoriesBG.Presets.xml +++ b/Constructor5/Presets/PieMenuCategory/AllPieMenuCategoriesBG.Presets.xml @@ -266,32 +266,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/PieMenuCategory/ConversationTopics-Friendly.Presets.xml b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Friendly.Presets.xml new file mode 100644 index 0000000..c238946 --- /dev/null +++ b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Friendly.Presets.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/PieMenuCategory/ConversationTopics-Funny.Presets.xml b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Funny.Presets.xml new file mode 100644 index 0000000..f635d1b --- /dev/null +++ b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Funny.Presets.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/PieMenuCategory/ConversationTopics-Mean.Presets.xml b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Mean.Presets.xml new file mode 100644 index 0000000..34ab5f4 --- /dev/null +++ b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Mean.Presets.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/PieMenuCategory/ConversationTopics-Mischief.Presets.xml b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Mischief.Presets.xml new file mode 100644 index 0000000..9dd65b9 --- /dev/null +++ b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Mischief.Presets.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/PieMenuCategory/ConversationTopics-Romantic.Presets.xml b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Romantic.Presets.xml new file mode 100644 index 0000000..d41ddb6 --- /dev/null +++ b/Constructor5/Presets/PieMenuCategory/ConversationTopics-Romantic.Presets.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Recipe/AllRecipesBG.Presets.xml b/Constructor5/Presets/Recipe/AllRecipesBG.Presets.xml index 6bb5745..b3b83bf 100644 --- a/Constructor5/Presets/Recipe/AllRecipesBG.Presets.xml +++ b/Constructor5/Presets/Recipe/AllRecipesBG.Presets.xml @@ -1762,18 +1762,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -1798,7 +1798,7 @@ - + @@ -2018,6 +2018,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2027,14 +2098,896 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2043,16 +2996,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2067,14 +3218,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2083,6 +3317,11 @@ + + + + + @@ -2090,4 +3329,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/Recipe/AllRecipesGP09.Presets.xml b/Constructor5/Presets/Recipe/AllRecipesGP09.Presets.xml index db095cf..bc3a3bd 100644 --- a/Constructor5/Presets/Recipe/AllRecipesGP09.Presets.xml +++ b/Constructor5/Presets/Recipe/AllRecipesGP09.Presets.xml @@ -65,7 +65,7 @@ - + diff --git a/Constructor5/Presets/Region/AllRegions.Presets.xml b/Constructor5/Presets/Region/AllRegions.Presets.xml deleted file mode 100644 index 8944a3f..0000000 --- a/Constructor5/Presets/Region/AllRegions.Presets.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsBG.Presets.xml b/Constructor5/Presets/Region/AllWorldsBG.Presets.xml new file mode 100644 index 0000000..3c93eb7 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsBG.Presets.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP01.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP01.Presets.xml new file mode 100644 index 0000000..553fb82 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP01.Presets.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP02.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP02.Presets.xml new file mode 100644 index 0000000..de34f21 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP02.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP03.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP03.Presets.xml new file mode 100644 index 0000000..d8eb10d --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP03.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP04.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP04.Presets.xml new file mode 100644 index 0000000..07485d9 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP04.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP06.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP06.Presets.xml new file mode 100644 index 0000000..edfc5d5 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP06.Presets.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP07.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP07.Presets.xml new file mode 100644 index 0000000..6d344b8 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP07.Presets.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP08.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP08.Presets.xml new file mode 100644 index 0000000..d39ae03 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP08.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP09.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP09.Presets.xml new file mode 100644 index 0000000..b69d24f --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP09.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP10.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP10.Presets.xml new file mode 100644 index 0000000..9ca56c8 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP10.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP11.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP11.Presets.xml new file mode 100644 index 0000000..0dce463 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP11.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsEP12.Presets.xml b/Constructor5/Presets/Region/AllWorldsEP12.Presets.xml new file mode 100644 index 0000000..976de3e --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsEP12.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP01.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP01.Presets.xml new file mode 100644 index 0000000..2e562f1 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP01.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP02.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP02.Presets.xml new file mode 100644 index 0000000..78ace1f --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP02.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP04.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP04.Presets.xml new file mode 100644 index 0000000..dafb8f7 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP04.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP06.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP06.Presets.xml new file mode 100644 index 0000000..8ceba79 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP06.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP07.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP07.Presets.xml new file mode 100644 index 0000000..880be26 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP07.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP08.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP08.Presets.xml new file mode 100644 index 0000000..eefe6a8 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP08.Presets.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP09.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP09.Presets.xml new file mode 100644 index 0000000..822332f --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP09.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP11.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP11.Presets.xml new file mode 100644 index 0000000..17b8b00 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP11.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Region/AllWorldsGP12.Presets.xml b/Constructor5/Presets/Region/AllWorldsGP12.Presets.xml new file mode 100644 index 0000000..dbc56b4 --- /dev/null +++ b/Constructor5/Presets/Region/AllWorldsGP12.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Reward/AllRewardsBG.Presets.xml b/Constructor5/Presets/Reward/AllRewardsBG.Presets.xml index bb05d78..db6e160 100644 --- a/Constructor5/Presets/Reward/AllRewardsBG.Presets.xml +++ b/Constructor5/Presets/Reward/AllRewardsBG.Presets.xml @@ -303,6 +303,9 @@ + + + @@ -310,8 +313,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Constructor5/Presets/Reward/AllRewardsEP06.Presets.xml b/Constructor5/Presets/Reward/AllRewardsEP06.Presets.xml index daa4bd9..6821666 100644 --- a/Constructor5/Presets/Reward/AllRewardsEP06.Presets.xml +++ b/Constructor5/Presets/Reward/AllRewardsEP06.Presets.xml @@ -22,4 +22,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/Reward/AllRewardsEP08.Presets.xml b/Constructor5/Presets/Reward/AllRewardsEP08.Presets.xml index 6f527d4..37098bd 100644 --- a/Constructor5/Presets/Reward/AllRewardsEP08.Presets.xml +++ b/Constructor5/Presets/Reward/AllRewardsEP08.Presets.xml @@ -42,7 +42,7 @@ - + diff --git a/Constructor5/Presets/RoleState/AllRoleStatesBG.Presets.xml b/Constructor5/Presets/RoleState/AllRoleStatesBG.Presets.xml index 91c7ceb..82f0dc4 100644 --- a/Constructor5/Presets/RoleState/AllRoleStatesBG.Presets.xml +++ b/Constructor5/Presets/RoleState/AllRoleStatesBG.Presets.xml @@ -249,15 +249,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -275,6 +323,15 @@ + + + + + + + + + @@ -355,10 +412,13 @@ + + + @@ -380,7 +440,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/SimFilter/AllSimFiltersBG.Presets.xml b/Constructor5/Presets/SimFilter/AllSimFiltersBG.Presets.xml index 3a565c5..496caa0 100644 --- a/Constructor5/Presets/SimFilter/AllSimFiltersBG.Presets.xml +++ b/Constructor5/Presets/SimFilter/AllSimFiltersBG.Presets.xml @@ -226,15 +226,15 @@ - - + + - + @@ -332,24 +332,46 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -358,30 +380,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - @@ -389,10 +450,38 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Situation/AllSituationsBG.Presets.xml b/Constructor5/Presets/Situation/AllSituationsBG.Presets.xml index 726287f..707fca7 100644 --- a/Constructor5/Presets/Situation/AllSituationsBG.Presets.xml +++ b/Constructor5/Presets/Situation/AllSituationsBG.Presets.xml @@ -114,7 +114,7 @@ - + @@ -173,8 +173,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -184,14 +233,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsBG.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsBG.Presets.xml index 809a189..5cb4007 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsBG.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsBG.Presets.xml @@ -884,7 +884,7 @@ - + @@ -935,6 +935,9 @@ + + + @@ -985,15 +988,20 @@ - + + + + + + - + @@ -1005,16 +1013,28 @@ + + + + + + + + - + + + + + @@ -1023,6 +1043,7 @@ + @@ -1071,25 +1092,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1109,12 +1158,16 @@ - + + + + + @@ -1123,11 +1176,20 @@ + + + + + + + + + @@ -1136,11 +1198,18 @@ + + + + + - - + + + + @@ -1152,28 +1221,23 @@ - - - + + + - - - - - - + @@ -1181,50 +1245,48 @@ - + + + - + - + - + - - - - + - + - - + - - - - - + + + + + - + @@ -1239,10 +1301,8 @@ - + - - @@ -1256,18 +1316,18 @@ - + - + - - + + - + @@ -1276,7 +1336,7 @@ - + @@ -1286,12 +1346,12 @@ - + - + @@ -1301,8 +1361,8 @@ - - + + @@ -1327,13 +1387,11 @@ - + - - @@ -1344,7 +1402,7 @@ - + @@ -1372,6 +1430,12 @@ + + + + + + @@ -1379,40 +1443,83 @@ - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1427,6 +1534,12 @@ + + + + + + @@ -1436,6 +1549,11 @@ + + + + + @@ -1443,5 +1561,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP01.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP01.Presets.xml index d4b1364..12f7b27 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP01.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP01.Presets.xml @@ -644,4 +644,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP04.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP04.Presets.xml index a403634..9dfeadb 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP04.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP04.Presets.xml @@ -36,4 +36,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP05.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP05.Presets.xml index f0045f5..f379821 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP05.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP05.Presets.xml @@ -119,4 +119,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP06.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP06.Presets.xml index 94529e6..b228762 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP06.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP06.Presets.xml @@ -156,4 +156,7 @@ + + + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP07.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP07.Presets.xml index c91b917..d6edba0 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP07.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP07.Presets.xml @@ -15,4 +15,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP08.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP08.Presets.xml index 0896d42..26fb33b 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP08.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP08.Presets.xml @@ -5,4 +5,17 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP10.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP10.Presets.xml index 027bf2b..60882ca 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsEP10.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsEP10.Presets.xml @@ -14,4 +14,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP01.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP01.Presets.xml index 222def2..b696deb 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP01.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP01.Presets.xml @@ -65,4 +65,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP04.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP04.Presets.xml index 40882c7..6afa30f 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP04.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP04.Presets.xml @@ -21,4 +21,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP05.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP05.Presets.xml index bab4603..0550b28 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP05.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP05.Presets.xml @@ -35,4 +35,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP06.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP06.Presets.xml index 6e67b13..542d701 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP06.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP06.Presets.xml @@ -38,4 +38,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP07.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP07.Presets.xml index 5f2c37e..74291f9 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP07.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP07.Presets.xml @@ -6,4 +6,6 @@ + + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsGP08.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP08.Presets.xml new file mode 100644 index 0000000..0aeeb1f --- /dev/null +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsGP08.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsSP12.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsSP12.Presets.xml index e3c68d3..bc9d20c 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsSP12.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsSP12.Presets.xml @@ -8,10 +8,7 @@ - - - \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoal/AllSituationGoalsSP18.Presets.xml b/Constructor5/Presets/SituationGoal/AllSituationGoalsSP18.Presets.xml index 9a019b1..b2feffb 100644 --- a/Constructor5/Presets/SituationGoal/AllSituationGoalsSP18.Presets.xml +++ b/Constructor5/Presets/SituationGoal/AllSituationGoalsSP18.Presets.xml @@ -1,4 +1,5 @@ + \ No newline at end of file diff --git a/Constructor5/Presets/SituationGoalSet/AllSituationGoalSetsBG.Presets.xml b/Constructor5/Presets/SituationGoalSet/AllSituationGoalSetsBG.Presets.xml index d92ed1f..e5fd38c 100644 --- a/Constructor5/Presets/SituationGoalSet/AllSituationGoalSetsBG.Presets.xml +++ b/Constructor5/Presets/SituationGoalSet/AllSituationGoalSetsBG.Presets.xml @@ -116,6 +116,21 @@ + + + + + + + + + + + + + + + diff --git a/Constructor5/Presets/SituationJob/AllSituationJobsBG.Presets.xml b/Constructor5/Presets/SituationJob/AllSituationJobsBG.Presets.xml index d162254..6b3f7bd 100644 --- a/Constructor5/Presets/SituationJob/AllSituationJobsBG.Presets.xml +++ b/Constructor5/Presets/SituationJob/AllSituationJobsBG.Presets.xml @@ -156,7 +156,7 @@ - + @@ -205,9 +205,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217,16 +252,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Skill/AllSkillsBG.Presets.xml b/Constructor5/Presets/Skill/AllSkillsBG.Presets.xml index 670fff3..0176dda 100644 --- a/Constructor5/Presets/Skill/AllSkillsBG.Presets.xml +++ b/Constructor5/Presets/Skill/AllSkillsBG.Presets.xml @@ -31,4 +31,10 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Skill/CreativeSkills.Presets.xml b/Constructor5/Presets/Skill/CreativeSkills.Presets.xml index fbaf982..dae5b62 100644 --- a/Constructor5/Presets/Skill/CreativeSkills.Presets.xml +++ b/Constructor5/Presets/Skill/CreativeSkills.Presets.xml @@ -13,11 +13,11 @@ + - \ No newline at end of file diff --git a/Constructor5/Presets/SocialInteraction/AllSocialInteractionsBG.Presets.xml b/Constructor5/Presets/SocialInteraction/AllSocialInteractionsBG.Presets.xml index 301a070..f06e874 100644 --- a/Constructor5/Presets/SocialInteraction/AllSocialInteractionsBG.Presets.xml +++ b/Constructor5/Presets/SocialInteraction/AllSocialInteractionsBG.Presets.xml @@ -710,6 +710,9 @@ + + + @@ -762,6 +765,8 @@ + + @@ -793,30 +798,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -826,8 +969,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -836,9 +1074,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/SocialInteraction/AllSocialInteractionsEP02.Presets.xml b/Constructor5/Presets/SocialInteraction/AllSocialInteractionsEP02.Presets.xml index c30828e..a63d19e 100644 --- a/Constructor5/Presets/SocialInteraction/AllSocialInteractionsEP02.Presets.xml +++ b/Constructor5/Presets/SocialInteraction/AllSocialInteractionsEP02.Presets.xml @@ -29,7 +29,6 @@ - diff --git a/Constructor5/Presets/SocialInteraction/AllSocialInteractionsGP10.Presets.xml b/Constructor5/Presets/SocialInteraction/AllSocialInteractionsGP10.Presets.xml index 67704c0..100d2e4 100644 --- a/Constructor5/Presets/SocialInteraction/AllSocialInteractionsGP10.Presets.xml +++ b/Constructor5/Presets/SocialInteraction/AllSocialInteractionsGP10.Presets.xml @@ -16,4 +16,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/TemplateChooser/AllTemplateChoosersBG.Presets.xml b/Constructor5/Presets/TemplateChooser/AllTemplateChoosersBG.Presets.xml index 56c5e1e..5bf66b9 100644 --- a/Constructor5/Presets/TemplateChooser/AllTemplateChoosersBG.Presets.xml +++ b/Constructor5/Presets/TemplateChooser/AllTemplateChoosersBG.Presets.xml @@ -49,9 +49,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/TestBasedScore/AllTestBasedScoresBG.Presets.xml b/Constructor5/Presets/TestBasedScore/AllTestBasedScoresBG.Presets.xml index 92e645c..b68d192 100644 --- a/Constructor5/Presets/TestBasedScore/AllTestBasedScoresBG.Presets.xml +++ b/Constructor5/Presets/TestBasedScore/AllTestBasedScoresBG.Presets.xml @@ -29,5 +29,27 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Trait/AllTraitsBG.Presets.xml b/Constructor5/Presets/Trait/AllTraitsBG.Presets.xml index 693d6e7..69d2782 100644 --- a/Constructor5/Presets/Trait/AllTraitsBG.Presets.xml +++ b/Constructor5/Presets/Trait/AllTraitsBG.Presets.xml @@ -108,7 +108,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -372,6 +372,8 @@ + + @@ -433,6 +435,18 @@ + + + + + + + + + + + + @@ -456,7 +470,14 @@ + + + + + + + @@ -475,18 +496,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -499,8 +591,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -509,15 +700,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + @@ -526,17 +828,75 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Trait/AllTraitsGP10.Presets.xml b/Constructor5/Presets/Trait/AllTraitsGP10.Presets.xml index e61c215..ed0f3a1 100644 --- a/Constructor5/Presets/Trait/AllTraitsGP10.Presets.xml +++ b/Constructor5/Presets/Trait/AllTraitsGP10.Presets.xml @@ -36,4 +36,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Trait/AllTraitsSP13.Presets.xml b/Constructor5/Presets/Trait/AllTraitsSP13.Presets.xml new file mode 100644 index 0000000..bf088a0 --- /dev/null +++ b/Constructor5/Presets/Trait/AllTraitsSP13.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Trait/AspirationCASTraits.Presets.xml b/Constructor5/Presets/Trait/AspirationCASTraits.Presets.xml index f5cd93a..fdefc2d 100644 --- a/Constructor5/Presets/Trait/AspirationCASTraits.Presets.xml +++ b/Constructor5/Presets/Trait/AspirationCASTraits.Presets.xml @@ -12,12 +12,12 @@ + + - - \ No newline at end of file diff --git a/Constructor5/Presets/Trait/Dislikes.Presets.xml b/Constructor5/Presets/Trait/Dislikes.Presets.xml index af07fd3..905a8ee 100644 --- a/Constructor5/Presets/Trait/Dislikes.Presets.xml +++ b/Constructor5/Presets/Trait/Dislikes.Presets.xml @@ -41,6 +41,17 @@ + + + + + + + + + + + @@ -60,17 +71,6 @@ - - - - - - - - - - - @@ -93,6 +93,12 @@ + + + + + + diff --git a/Constructor5/Presets/Trait/GameplayTraits.Presets.xml b/Constructor5/Presets/Trait/GameplayTraits.Presets.xml index 6fa204d..5fa0701 100644 --- a/Constructor5/Presets/Trait/GameplayTraits.Presets.xml +++ b/Constructor5/Presets/Trait/GameplayTraits.Presets.xml @@ -65,14 +65,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + @@ -171,17 +193,6 @@ - - - - - - - - - - - @@ -218,14 +229,6 @@ - - - - - - - - \ No newline at end of file diff --git a/Constructor5/Presets/Trait/GhostTraits.Presets.xml b/Constructor5/Presets/Trait/GhostTraits.Presets.xml index 5863f5c..d75bf3f 100644 --- a/Constructor5/Presets/Trait/GhostTraits.Presets.xml +++ b/Constructor5/Presets/Trait/GhostTraits.Presets.xml @@ -30,7 +30,7 @@ - + diff --git a/Constructor5/Presets/Trait/HiddenTraits.Presets.xml b/Constructor5/Presets/Trait/HiddenTraits.Presets.xml index 24d2ffc..555e394 100644 --- a/Constructor5/Presets/Trait/HiddenTraits.Presets.xml +++ b/Constructor5/Presets/Trait/HiddenTraits.Presets.xml @@ -7,7 +7,7 @@ - + @@ -174,8 +174,24 @@ + + + + + + + + + + + + + + + + @@ -194,14 +210,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -209,19 +353,76 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -684,89 +885,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -961,79 +1079,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1050,6 +1095,7 @@ + diff --git a/Constructor5/Presets/Trait/Likes.Presets.xml b/Constructor5/Presets/Trait/Likes.Presets.xml index d4b96ac..7c5d706 100644 --- a/Constructor5/Presets/Trait/Likes.Presets.xml +++ b/Constructor5/Presets/Trait/Likes.Presets.xml @@ -41,6 +41,17 @@ + + + + + + + + + + + @@ -60,17 +71,6 @@ - - - - - - - - - - - @@ -93,6 +93,12 @@ + + + + + + diff --git a/Constructor5/Presets/Trait/PersonalityTraits.Presets.xml b/Constructor5/Presets/Trait/PersonalityTraits.Presets.xml index 18fc64d..f66201a 100644 --- a/Constructor5/Presets/Trait/PersonalityTraits.Presets.xml +++ b/Constructor5/Presets/Trait/PersonalityTraits.Presets.xml @@ -46,6 +46,20 @@ + + + + + + + + + + + + + + @@ -60,13 +74,6 @@ - - - - - - - diff --git a/Constructor5/Presets/Venue/AllVenuesBG.Presets.xml b/Constructor5/Presets/Venue/AllVenuesBG.Presets.xml index 60dfec6..de199cf 100644 --- a/Constructor5/Presets/Venue/AllVenuesBG.Presets.xml +++ b/Constructor5/Presets/Venue/AllVenuesBG.Presets.xml @@ -17,4 +17,10 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/Whim/AllWhimsBG.Presets.xml b/Constructor5/Presets/Whim/AllWhimsBG.Presets.xml index 267358f..5494f37 100644 --- a/Constructor5/Presets/Whim/AllWhimsBG.Presets.xml +++ b/Constructor5/Presets/Whim/AllWhimsBG.Presets.xml @@ -437,6 +437,8 @@ + + @@ -512,6 +514,8 @@ + + @@ -555,14 +559,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -572,7 +603,6 @@ - @@ -581,12 +611,23 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsBG.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsBG.Presets.xml new file mode 100644 index 0000000..edb5209 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsBG.Presets.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP01.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP01.Presets.xml new file mode 100644 index 0000000..69b097e --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP01.Presets.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP02.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP02.Presets.xml new file mode 100644 index 0000000..b02b3c7 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP02.Presets.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP03.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP03.Presets.xml new file mode 100644 index 0000000..f7d03fe --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP03.Presets.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP04.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP04.Presets.xml new file mode 100644 index 0000000..a2a7ef0 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP04.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP06.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP06.Presets.xml new file mode 100644 index 0000000..8fe4e2b --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP06.Presets.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP08.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP08.Presets.xml new file mode 100644 index 0000000..fba3027 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP08.Presets.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP09.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP09.Presets.xml new file mode 100644 index 0000000..cfdeedf --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP09.Presets.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP10.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP10.Presets.xml new file mode 100644 index 0000000..59877cd --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP10.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP12.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP12.Presets.xml new file mode 100644 index 0000000..1870561 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsEP12.Presets.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP01.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP01.Presets.xml new file mode 100644 index 0000000..0af85a7 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP01.Presets.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP02.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP02.Presets.xml new file mode 100644 index 0000000..c9236d9 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP02.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP03.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP03.Presets.xml new file mode 100644 index 0000000..9d5142c --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP03.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP06.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP06.Presets.xml new file mode 100644 index 0000000..4af1238 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP06.Presets.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP07.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP07.Presets.xml new file mode 100644 index 0000000..a004ee3 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP07.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP08.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP08.Presets.xml new file mode 100644 index 0000000..5cc0d81 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP08.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP09.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP09.Presets.xml new file mode 100644 index 0000000..c952f05 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP09.Presets.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP10.Presets.xml b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP10.Presets.xml new file mode 100644 index 0000000..951c199 --- /dev/null +++ b/Constructor5/Presets/ZoneDirector/AllZoneDirectorsGP10.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsBG.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsBG.Presets.xml new file mode 100644 index 0000000..6310268 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsBG.Presets.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsEP03.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP03.Presets.xml new file mode 100644 index 0000000..dcb2b6e --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP03.Presets.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsEP04.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP04.Presets.xml new file mode 100644 index 0000000..b3af1af --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP04.Presets.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsEP06.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP06.Presets.xml new file mode 100644 index 0000000..b59ed35 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP06.Presets.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsEP07.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP07.Presets.xml new file mode 100644 index 0000000..6daed0c --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP07.Presets.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsEP08.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP08.Presets.xml new file mode 100644 index 0000000..53709a3 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP08.Presets.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsEP09.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP09.Presets.xml new file mode 100644 index 0000000..2bef212 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP09.Presets.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsEP10.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP10.Presets.xml new file mode 100644 index 0000000..489be33 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP10.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsEP11.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP11.Presets.xml new file mode 100644 index 0000000..0ee8586 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsEP11.Presets.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsGP02.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsGP02.Presets.xml new file mode 100644 index 0000000..603771c --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsGP02.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsGP04.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsGP04.Presets.xml new file mode 100644 index 0000000..8ce6e0a --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsGP04.Presets.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsGP06.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsGP06.Presets.xml new file mode 100644 index 0000000..31ee853 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsGP06.Presets.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsGP09.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsGP09.Presets.xml new file mode 100644 index 0000000..b0ca0ac --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsGP09.Presets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsSP16.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsSP16.Presets.xml new file mode 100644 index 0000000..8478ed4 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsSP16.Presets.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Constructor5/Presets/ZoneModifier/AllLotTraitsSP18.Presets.xml b/Constructor5/Presets/ZoneModifier/AllLotTraitsSP18.Presets.xml new file mode 100644 index 0000000..2d1e7b0 --- /dev/null +++ b/Constructor5/Presets/ZoneModifier/AllLotTraitsSP18.Presets.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Constructor5/TuningActions/Interactions/Friendly.xml b/Constructor5/TuningActions/Interactions/Friendly.xml index ee442cf..05e759a 100644 --- a/Constructor5/TuningActions/Interactions/Friendly.xml +++ b/Constructor5/TuningActions/Interactions/Friendly.xml @@ -709,6 +709,7 @@ Interaction_Social_Contagious Interaction_Skill_Child_Social + @@ -760,6 +761,7 @@ 104567 165339 216556 + 294094 $v @@ -821,6 +823,7 @@ 104567 165339 216556 + 294094 $v @@ -838,7 +841,7 @@ - $ScoreType + $ScoreTypeKey $ScoreForGreatSuccess @@ -898,6 +901,7 @@ 109228 104567 165339 + 311364 $v @@ -916,7 +920,7 @@ - $ScoreType + $ScoreTypeKey LESS_OR_EQUAL $ScoreForFailure @@ -977,6 +981,7 @@ 109228 104567 165339 + 311364 $v @@ -995,7 +1000,7 @@ - $ScoreType + $ScoreTypeKey LESS_OR_EQUAL $ScoreForHorribleFailure @@ -1054,6 +1059,7 @@ 109228 104567 165339 + 311364 $v diff --git a/Constructor5/TuningActions/Interactions/Funny.xml b/Constructor5/TuningActions/Interactions/Funny.xml index 2737fd4..c6ed711 100644 --- a/Constructor5/TuningActions/Interactions/Funny.xml +++ b/Constructor5/TuningActions/Interactions/Funny.xml @@ -964,7 +964,7 @@ - $ScoreType + $ScoreTypeKey 40 @@ -1099,6 +1099,7 @@ 38110 11042 104567 + 311364 $v @@ -1114,7 +1115,7 @@ - $ScoreType + $ScoreTypeKey LESS_OR_EQUAL 5 @@ -1250,6 +1251,7 @@ 38110 11042 104567 + 311364 $v @@ -1265,7 +1267,7 @@ - $ScoreType + $ScoreTypeKey LESS_OR_EQUAL -5 @@ -1314,6 +1316,7 @@ 31828 11042 104567 + 311364 $v diff --git a/Constructor5/TuningActions/Interactions/ImmediateInteraction.xml b/Constructor5/TuningActions/Interactions/ImmediateInteraction.xml index bfc28a9..c31b229 100644 --- a/Constructor5/TuningActions/Interactions/ImmediateInteraction.xml +++ b/Constructor5/TuningActions/Interactions/ImmediateInteraction.xml @@ -1,18 +1,20 @@  - - - - - - $v - - $LearnTraitLootKey - + + + + + + + $v + + + + - - + + False diff --git a/Constructor5/TuningActions/Interactions/Mean.xml b/Constructor5/TuningActions/Interactions/Mean.xml index 56bc9db..b097f18 100644 --- a/Constructor5/TuningActions/Interactions/Mean.xml +++ b/Constructor5/TuningActions/Interactions/Mean.xml @@ -949,7 +949,7 @@ - $ScoreType + $ScoreTypeKey 15 @@ -1039,7 +1039,7 @@ - $ScoreType + $ScoreTypeKey 25 diff --git a/Constructor5/TuningActions/Interactions/Mischief.xml b/Constructor5/TuningActions/Interactions/Mischief.xml index 2cc2311..e2f5e06 100644 --- a/Constructor5/TuningActions/Interactions/Mischief.xml +++ b/Constructor5/TuningActions/Interactions/Mischief.xml @@ -985,45 +985,23 @@ - $AnimationOnSuccess - - - - - - - - - $BalloonSet - - - - - Actor - - - - - - + $AnimationOnSuccess - 11042 - 26367 - 11080 - 10954 - 258408 - 27896 - 36121 - 26763 - 96898 - 99714 - 11081 - 11081 - 76190 - 104567 - 195754 + 11036 + 26367 + 11080 + 10954 + 258408 + 27896 + 36121 + 96898 + 11081 + 11081 + 76190 + 104567 + 195754 $v @@ -1031,26 +1009,6 @@ $LearnTraitLootKey - - - - - - Actor - - 28376 - - - - Listeners - - 28357 - - - - - - @@ -1061,44 +1019,51 @@ - $AnimationOnFailure - - - - - - - - - $BalloonSet - - - - - Actor - - - - - - + $AnimationOnFailure + + + + 11042 + 23797 + 26367 + 11080 + 10954 + 258408 + 27896 + 36121 + 96898 + 99714 + 76190 + 104567 + 201718 + 273714 + + + FAILURE + + + + + + + $AnimationOnFailure - 11042 - 23797 - 26367 - 11080 - 10954 - 258408 - 27896 - 36121 - 26788 - 96898 - 99714 - 76190 - 104567 - 201718 + 11042 + 23797 + 26367 + 11080 + 10954 + 258408 + 27896 + 36121 + 96898 + 99714 + 76190 + 104567 + 201718 + 273714 $v @@ -1107,70 +1072,95 @@ $LearnTraitLootKey FAILURE - - - - - - Actor - - 28357 - - - - Listeners - - 77331 - - + + + + + 0 + + + + 202623 + - - - + + + + + + + + + $ScoreTypeKey + + LESS_OR_EQUAL + -1 + + + + + + + + 306279 + + + + Actor + + + TargetSim + + + + + + + 202615 + + + + + + 306279 + + + + Actor + + + TargetSim + + + + + + + + - $AnimationOnFailure - - - - - - - - - $BalloonSet - - - - - Actor - - - - - - + 11857 - 11042 - 23797 - 26367 - 11080 - 10954 - 258408 - 27896 - 36121 - 26788 - 96898 - 99714 - 76190 - 104567 - 201718 + 11042 + 23797 + 10954 + 26367 + 36121 + 258408 + 76171 + 31828 + 96898 + 11080 + 76190 + 104567 + 273714 $v @@ -1186,13 +1176,13 @@ Actor - 28376 + 28356 Listeners - 130210 + 28354 @@ -1200,37 +1190,12 @@ - - - - 0 - - - - 202623 - - - - - - - - - - 24574 - - LESS_OR_EQUAL - -1 - - - - - 202615 + 31850 diff --git a/Constructor5/TuningActions/Interactions/Romance.xml b/Constructor5/TuningActions/Interactions/Romance.xml index 29c4f0a..ba847f9 100644 --- a/Constructor5/TuningActions/Interactions/Romance.xml +++ b/Constructor5/TuningActions/Interactions/Romance.xml @@ -31,7 +31,7 @@ - 162659 + 162659 @@ -39,18 +39,18 @@ - 129459 + 129459 True - 126907 + 126907 - 76132 + 76132 @@ -75,7 +75,7 @@ - 264157 + 264157 @@ -83,7 +83,8 @@ - 165621 + 165621 + 278309 @@ -92,7 +93,7 @@ - 129459 + 129459 True @@ -108,7 +109,7 @@ - 76132 + 76132 @@ -139,7 +140,7 @@ - 199497 + 199497 @@ -161,7 +162,7 @@ - 0x6B8B48D2 + 0x6B8B48D2 @@ -175,7 +176,7 @@ - 259314 + 259314 TargetSim @@ -187,17 +188,156 @@ + + + + 312302 + + + + + 0 + + + + + + 311267 + + TargetSim + + + + + + + + 30 + 100 + + + Actor + + + TargetSim + + 16651 + + + + + + + EQUAL + 15839 + + TargetSim + + + + + + EQUAL + 15837 + + TargetSim + + + + + + EQUAL + 15840 + + TargetSim + + + + + + EQUAL + 15829 + + TargetSim + + + + + + EQUAL + 15822 + + TargetSim + + + + + + EQUAL + 15816 + + TargetSim + + + + + + EQUAL + 99429 + + TargetSim + + + + + + EQUAL + 15825 + + TargetSim + + + + + + + + + + + - 256558 + 313884 - 184986 + 315414 + + + + + + + 312300 + + + + + + + 256558 + + + + + + + 184986 @@ -861,26 +1001,24 @@ - $AnimationOnSuccess + $AnimationOnSuccess - - - - - - - - $BalloonSet - - - - - Actor - - - - - + + + + + + + $BalloonSet + + + + + Actor + + + + @@ -889,29 +1027,96 @@ - 134003 + 134003 + + + + + + + + + AdventureTest_Initial_Common + + + 313174 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 138666 + + + + + + + + 15 + - 10766 - 10954 - 27854 - 11036 - 10900 - 28581 - 23798 - 24120 - 32056 - 76189 - 104567 - 133107 - 133108 - 154622 - 155126 - 216558 + 10766 + 10954 + 27854 + 11036 + 10900 + 28581 + 23798 + 24120 + 32056 + 76189 + 104567 + 133107 + 133108 + 154622 + 155126 + 294094 + 311749 + 312033 + 297789 + 216558 $v @@ -922,6 +1127,131 @@ + + + + + + $AnimationOnFailure + + + + + + 11878 + + + + + + + + + + + + + + + + + + TargetSim + + + + + + + + + 0x10B74FF8 + + SPEECH + + + + + + + + + + AdventureTest_Initial_Common + + + 313174 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 138666 + + + + + + + + + + 15 + + + + + + 291673 + + + + + + + True + + + + + + @@ -929,26 +1259,24 @@ - $AnimationOnSuccess + $AnimationOnSuccess - - - - - - - - $BalloonSet - - - - - Actor - - - - - + + + + + + + $BalloonSet + + + + + Actor + + + + @@ -957,29 +1285,96 @@ - 134003 + 134003 + + + + + + + + + AdventureTest_Initial_Common + + + 313174 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 138666 + + + + + + + + 15 + - 10766 - 10954 - 27854 - 11036 - 10900 - 28581 - 23798 - 32056 - 24120 - 76189 - 104567 - 133108 - 133107 - 154622 - 155126 - 216558 + 10766 + 10954 + 27854 + 11036 + 10900 + 28581 + 23798 + 32056 + 24120 + 76189 + 104567 + 133108 + 133107 + 154622 + 155126 + 294094 + 311749 + 312033 + 297789 + 216558 $v @@ -997,7 +1392,7 @@ - $ScoreType + 314810 GREATER_OR_EQUAL 50 @@ -1007,12 +1402,12 @@ - 132589 + 132589 - 188306 + 188306 @@ -1023,35 +1418,33 @@ - $AnimationOnFailure + $AnimationOnFailure - - - - - - $BalloonSet - - - - - Actor - - - - 75390 + $BalloonSet + + + + + Actor + + + + + + + 75390 - 16657 + 16657 LESS_OR_EQUAL @@ -1074,21 +1467,89 @@ + + + + + + AdventureTest_Initial_Common + + + 313202 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 32759 + + + + + + + + + + 15 + + + + - 10954 - 27854 - 24126 - 11042 - 10901 - 23797 - 28581 - 36086 - 32056 - 76189 - 258936 - 99714 - 104567 - 133106 + 10954 + 27854 + 24126 + 11042 + 10901 + 23797 + 28581 + 36086 + 32056 + 76189 + 258936 + 99714 + 104567 + 133106 + 289536 + 311749 + 311346 $v @@ -1104,7 +1565,7 @@ - $ScoreType + 314810 LESS_OR_EQUAL 4 @@ -1114,12 +1575,12 @@ - 132589 + 132589 - 188306 + 188306 @@ -1130,35 +1591,33 @@ - $AnimationOnFailure + $AnimationOnFailure - - - - - - $BalloonSet - - - - - Actor - - - - 75390 + $BalloonSet + + + + + Actor + + + + + + + 75390 - 16657 + 16657 LESS_OR_EQUAL @@ -1181,28 +1640,97 @@ + + + + + + AdventureTest_Initial_Common + + + 313202 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 32759 + + + + + + + + + + 15 + + + + TargetSim - 264158 + 264158 Actor - 10954 - 27854 - 24126 - 11040 - 10899 - 26000 - 28581 - 36086 - 32056 - 76189 - 258936 - 99714 - 104567 - 133106 + 10954 + 27854 + 24126 + 11040 + 10899 + 26000 + 28581 + 36086 + 32056 + 76189 + 258936 + 99714 + 104567 + 133106 + 289536 + 311749 + 273714 + 311346 $v @@ -1221,7 +1749,7 @@ - $ScoreType + 314810 LESS_OR_EQUAL -15 @@ -1231,12 +1759,12 @@ - 132589 + 132589 - 188306 + 188306 @@ -1247,43 +1775,110 @@ - $AnimationOnFailure + $AnimationOnFailure - - - - - - $BalloonSet - - - - - Actor - - - + + + + + $BalloonSet + + + + + Actor + + + + + + + + AdventureTest_Initial_Common + + + 313202 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 32759 + + + + + + + + + + 15 + + + + TargetSim - 264158 + 264158 Actor - 10954 - 23796 - 32056 - 10899 - 76189 - 104567 + 10954 + 23796 + 32056 + 10899 + 76189 + 104567 + 289536 + 311749 + 273714 + 311346 $v @@ -1299,13 +1894,13 @@ Actor - 28356 + 28356 Listeners - 28354 + 28354 @@ -1321,10 +1916,10 @@ - 32055 + 32055 - 188306 + 188306 @@ -1335,7 +1930,7 @@ - $AnimationOnFailure + 12007 @@ -1343,7 +1938,7 @@ - 39011 + 39011 @@ -1356,26 +1951,93 @@ + + + + + + AdventureTest_Initial_Common + + + 313202 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 32759 + + + + + + + + + + 15 + + + + TargetSim - 264158 + 264158 Actor - 10954 - 27854 - 24126 - 11042 - 10901 - 23797 - 32056 - 76189 - 258936 - 99714 - 104567 - 133106 + 10954 + 27854 + 24126 + 11042 + 10901 + 23797 + 32056 + 76189 + 258936 + 99714 + 104567 + 133106 + 311749 + 311346 $v @@ -1394,13 +2056,13 @@ TargetSim - 187703 + 187703 - 188303 + 188303 @@ -1411,24 +2073,22 @@ - $AnimationOnSuccess + 12006 - - - - - - $BalloonSet - - - - - Actor - - - + + + + + $BalloonSet + + + + + Actor + + @@ -1439,35 +2099,95 @@ - 134003 + 134003 + + + + + + + + + AdventureTest_Initial_Common + + + 313174 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 138666 + + + + + + + + 15 + - 10766 - 10954 - 27854 - 11036 - 10900 - 23798 - 32056 - 24120 - 76189 - 104567 - 133107 - 154622 - 155126 - 133108 - 9792 - 216558 - - - $v - - - $LearnTraitLootKey + 10766 + 10954 + 27854 + 11036 + 10900 + 23798 + 32056 + 24120 + 76189 + 104567 + 133107 + 154622 + 155126 + 133108 + 9792 + 294094 + 311749 + 312033 + 216558 @@ -1478,19 +2198,19 @@ - 188306 + 188306 TargetSim - 132589 + 132589 - $ScoreType + 314810 GREATER_OR_EQUAL 11 @@ -1500,18 +2220,18 @@ - 188306 + 188306 - 132589 + 132589 - $ScoreType + 314810 GREATER_OR_EQUAL 14 @@ -1527,7 +2247,7 @@ - $AnimationOnFailure + 12005 @@ -1535,7 +2255,7 @@ - 97540 + $BalloonSet @@ -1548,34 +2268,94 @@ + + + + + + AdventureTest_Initial_Common + + + 313202 + + + + + + + AdventureTest_Initial_Common + + + + 0 + + + + 313453 + + + + + + 0 + + + + + TargetSim + + 312902 + 306463 + 306487 + + + + + + + + 0 + + + + 32759 + + + + + + + + + + 15 + + + + TargetSim - 264158 + 264158 Actor - 10954 - 27854 - 24126 - 11040 - 10899 - 26000 - 32056 - 76189 - 258936 - 99714 - 104567 - 133106 - 154622 - 155126 - - - $v - - - $LearnTraitLootKey + 10954 + 27854 + 24126 + 11040 + 10899 + 26000 + 32056 + 76189 + 258936 + 99714 + 104567 + 133106 + 154622 + 155126 + 311749 FAILURE @@ -1590,13 +2370,13 @@ TargetSim - 132589 + 132589 - $ScoreType + 314810 LESS 13 @@ -1608,13 +2388,13 @@ - 132589 + 132589 - $ScoreType + 314810 LESS 16 diff --git a/Constructor5/Version.txt b/Constructor5/Version.txt index 50c6bab..3633ead 100644 --- a/Constructor5/Version.txt +++ b/Constructor5/Version.txt @@ -1 +1 @@ -v5.0-beta.8 \ No newline at end of file +v5.0-beta.9 \ No newline at end of file