diff --git a/isometric-park-fna/Engines/DialogEngine.cs b/isometric-park-fna/Engines/DialogEngine.cs --- a/isometric-park-fna/Engines/DialogEngine.cs +++ b/isometric-park-fna/Engines/DialogEngine.cs @@ -135,7 +135,7 @@ CurrentSpeaker = speaker.Trim(), Options = this.Story.currentChoices .Select(option => BleepAndFlatten(option.text, - profanity_setting)) + profanity_setting)) .ToList() }); @@ -187,7 +187,7 @@ CurrentSpeaker = speaker.Trim(), Options = this.Story.currentChoices .Select(option => BleepAndFlatten(option.text, - profanity_setting )) + profanity_setting )) .ToList() }); diff --git a/isometric-park-fna/Engines/GameBridgeEngine.cs b/isometric-park-fna/Engines/GameBridgeEngine.cs --- a/isometric-park-fna/Engines/GameBridgeEngine.cs +++ b/isometric-park-fna/Engines/GameBridgeEngine.cs @@ -17,7 +17,7 @@ typeof(ToggleVisibilityMessage), typeof(SetResolutionMessage), typeof(SetFontMessage), - typeof(QuitGameMessage))] + typeof(QuitGameMessage))] [Reads(typeof(AreaComponent), typeof(ContractStatusComponent), typeof(OptionsComponent))] @@ -106,10 +106,10 @@ } } - foreach (ref readonly var message in ReadMessages()) - { - this.game.quit = true; - } + foreach (ref readonly var message in ReadMessages()) + { + this.game.quit = true; + } } } diff --git a/isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs b/isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs --- a/isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs +++ b/isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs @@ -27,7 +27,7 @@ typeof(SetDialogMessage), typeof(DialogChoiceMessage), typeof(SetOptionMessage), - typeof(QuitGameMessage))] + typeof(QuitGameMessage))] [Reads(typeof(VisibilityComponent), typeof(WindowTypeComponent), typeof(TrespassingPolicyComponent), @@ -102,7 +102,7 @@ this.dialogChoiceMessages = new List(); this.setOptionMessages = new List(); this.gameRateMessages = new List(); - this.quitGameMessages = new List(); + this.quitGameMessages = new List(); this.windowStatuses = new Dictionary(); @@ -205,10 +205,10 @@ SendMessage(message); } - foreach (var message in this.quitGameMessages) - { - SendMessage(message); - } + foreach (var message in this.quitGameMessages) + { + SendMessage(message); + } foreach (var message in this.setOptionMessages) { diff --git a/isometric-park-fna/Engines/InputEngine.cs b/isometric-park-fna/Engines/InputEngine.cs --- a/isometric-park-fna/Engines/InputEngine.cs +++ b/isometric-park-fna/Engines/InputEngine.cs @@ -22,7 +22,7 @@ typeof(TogglePauseMessage), typeof(GameRateMessage), typeof(GameStateMessage), - typeof(QuitGameMessage))] + typeof(QuitGameMessage))] [Reads(typeof(WindowTypeComponent), typeof(GameStateComponent), typeof(VisibilityComponent))] @@ -203,15 +203,15 @@ if (keyboardCur.IsKeyDown(Keys.Q) && keyboardPrev.IsKeyUp(Keys.Q)) { Logging.Info("Quitting"); - SendMessage(new QuitGameMessage{}); + SendMessage(new QuitGameMessage {}); } #endif if ((keyboardCur.IsKeyDown(Keys.Q) && keyboardPrev.IsKeyUp(Keys.Q)) - && (keyboardCur.IsKeyDown(Keys.LeftControl) - || keyboardCur.IsKeyDown(Keys.RightControl))) + && (keyboardCur.IsKeyDown(Keys.LeftControl) + || keyboardCur.IsKeyDown(Keys.RightControl))) { Logging.Info("Quitting"); - SendMessage(new QuitGameMessage{}); + SendMessage(new QuitGameMessage {}); } #endregion misc_keys #region mouse_movement diff --git a/isometric-park-fna/Engines/SimulationBridgeEngine.cs b/isometric-park-fna/Engines/SimulationBridgeEngine.cs --- a/isometric-park-fna/Engines/SimulationBridgeEngine.cs +++ b/isometric-park-fna/Engines/SimulationBridgeEngine.cs @@ -68,7 +68,7 @@ decimal new_contract_amount = 0M; decimal new_enforcement_amount = 0M; - decimal new_misc_amount = 0M; + decimal new_misc_amount = 0M; // decimal new_upkeep_amount = 0M; foreach (ref readonly var entity in ReadEntities()) @@ -89,32 +89,32 @@ case "Enforcement": new_enforcement_amount += budgetComponent.amount; break; - case "Misc": - new_misc_amount += budgetComponent.amount; - break; + case "Misc": + new_misc_amount += budgetComponent.amount; + break; } } -#region events - if (simulation.latestBudget.DateTime != default) - { + #region events + if (simulation.latestBudget.DateTime != default) + { - if (simulation.latestBudget.money < 25_000M) - { - SendMessage(new SpawnDialogMessage {Path = "LowFunds"}); - } - if (simulation.latestBudget.money < 10_000M) - { - SendMessage(new SpawnDialogMessage {Path = "VeryLowFunds"}); - } - if (simulation.map.tree_count < 400) - { - SendMessage(new SpawnDialogMessage {Path = "PoorTreeHealth"}); - } - } + if (simulation.latestBudget.money < 25_000M) + { + SendMessage(new SpawnDialogMessage {Path = "LowFunds"}); + } + if (simulation.latestBudget.money < 10_000M) + { + SendMessage(new SpawnDialogMessage {Path = "VeryLowFunds"}); + } + if (simulation.map.tree_count < 400) + { + SendMessage(new SpawnDialogMessage {Path = "PoorTreeHealth"}); + } + } -#endregion + #endregion if (this.ticksToSend > 0) @@ -186,7 +186,7 @@ simulation.contracts = new_contract_amount; simulation.enforcement = new_enforcement_amount; - simulation.misc = new_misc_amount; + simulation.misc = new_misc_amount; //Move this here? diff --git a/isometric-park-fna/Engines/Spawners/DialogSpawner.cs b/isometric-park-fna/Engines/Spawners/DialogSpawner.cs --- a/isometric-park-fna/Engines/Spawners/DialogSpawner.cs +++ b/isometric-park-fna/Engines/Spawners/DialogSpawner.cs @@ -75,9 +75,9 @@ var index = 0; var path = message.Path; - var matching_dialog_entites = ReadEntities() - .SelectWhereF(e => GetComponent(e), - e => e.StartingKnot == path); + var matching_dialog_entites = ReadEntities() + .SelectWhereF(e => GetComponent(e), + e => e.StartingKnot == path); //If there are no existing dialog: if(ReadEntities().Length == 0 && this.Story.currentChoices.Count() == 0 diff --git a/isometric-park-fna/UI/InGameMenu.cs b/isometric-park-fna/UI/InGameMenu.cs --- a/isometric-park-fna/UI/InGameMenu.cs +++ b/isometric-park-fna/UI/InGameMenu.cs @@ -55,7 +55,7 @@ { System.Console.WriteLine("Quitting"); - bridgeEngine.quitGameMessages.Add(new QuitGameMessage{}); + bridgeEngine.quitGameMessages.Add(new QuitGameMessage {}); } ImGui.End(); diff --git a/isometric-park-fna/UI/MainMenu.cs b/isometric-park-fna/UI/MainMenu.cs --- a/isometric-park-fna/UI/MainMenu.cs +++ b/isometric-park-fna/UI/MainMenu.cs @@ -41,7 +41,7 @@ if (ImGui.Button("Quit", button_size)) { System.Console.WriteLine("Quitting"); - bridgeEngine.quitGameMessages.Add(new QuitGameMessage{}); + bridgeEngine.quitGameMessages.Add(new QuitGameMessage {}); } ImGui.End(); diff --git a/isometric-park-fna/UI/OptionsWindow.cs b/isometric-park-fna/UI/OptionsWindow.cs --- a/isometric-park-fna/UI/OptionsWindow.cs +++ b/isometric-park-fna/UI/OptionsWindow.cs @@ -67,8 +67,9 @@ { foreach(var (width_option, height_option) in new[] {(1280, 640), - (640, 320), (960, 480), (1600, 800), - (2560, 1440), (1280, 720), (1920, 1080)}) + (640, 320), (960, 480), (1600, 800), + (2560, 1440), (1280, 720), (1920, 1080) + }) { if (ImGui.Selectable(string.Format("{0}x{1}", width_option, height_option))) {