alysbrooks-public/games/isometric-park-fna Commit - r488:2f1c0b5b9bbe

alysbrooks-public » games » isometric-park-fna

Commit `r488:2f1c0b5b9bbe` public

parent | child

Description:

Fix style.

Commit status:

[Not Reviewed]

References:

m5-events

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r488:2f1c0b5b9bbe - Mon, 20 Dec 2021 01:02:28

isometric-park-fna/Engines/SimulationBridgeEngine.cs ¶ +24 -24

@@ -114,32 +114,32
114	name = string.Format("#logging_company.capitalizeAll# {0}", this.simulation.DateTime.ToShortDateString())	114	name = string.Format("#logging_company.capitalizeAll# {0}", this.simulation.DateTime.ToShortDateString())
115	});	115	});
116		116
117	#region events	117	#region events
118	if (simulation.latestBudget.DateTime != default)	118	if (simulation.latestBudget.DateTime != default)
119	{	119	{
120		120
121	if (simulation.latestBudget.money < 0M	121	if (simulation.latestBudget.money < 0M
122	&& simulation.previousBudget.money >= 0M)	122	&& simulation.previousBudget.money >= 0M)
123	{	123	{
124	SendMessage<SpawnDialogMessage>(new SpawnDialogMessage {Path = "EndLowFunds"});	124	SendMessage<SpawnDialogMessage>(new SpawnDialogMessage {Path = "EndLowFunds"});
125	}	125	}
126	else if (simulation.latestBudget.money < 10_000M	126	else if (simulation.latestBudget.money < 10_000M
127	&& simulation.previousBudget.money >= 10_000M)	127	&& simulation.previousBudget.money >= 10_000M)
128	{	128	{
129	SendMessage<SpawnDialogMessage>(new SpawnDialogMessage {Path = "VeryLowFunds"});	129	SendMessage<SpawnDialogMessage>(new SpawnDialogMessage {Path = "VeryLowFunds"});
130	}	130	}
131	else if (simulation.latestBudget.money < 25_000M	131	else if (simulation.latestBudget.money < 25_000M
132	&& simulation.previousBudget.money >= 25_000M)	132	&& simulation.previousBudget.money >= 25_000M)
133	{	133	{
134	SendMessage<SpawnDialogMessage>(new SpawnDialogMessage {Path = "LowFunds"});	134	SendMessage<SpawnDialogMessage>(new SpawnDialogMessage {Path = "LowFunds"});
135	}	135	}
136	if (simulation.map.tree_count < 400)	136	if (simulation.map.tree_count < 400)
137	{	137	{
138	SendMessage<SpawnDialogMessage>(new SpawnDialogMessage {Path = "PoorTreeHealth"});	138	SendMessage<SpawnDialogMessage>(new SpawnDialogMessage {Path = "PoorTreeHealth"});
139	}	139	}
140	}	140	}
141		141
142	#endregion	142	#endregion
143		143
144	foreach (ref readonly var entity in ReadEntities<TreeDeltaComponent>())	144	foreach (ref readonly var entity in ReadEntities<TreeDeltaComponent>())
145	{	145	{

isometric-park-fna/FNAGame.cs ¶ +5 -4

                     NewGameWindow.Initialize(this.grammar);
                     this.Story = new Story(File.ReadAllText(@"Content/dialog.json"));
                     //Bindings have to
                     Story.BindExternalFunction ("endGame", () => {
-                            Logging.Success("endGame");
+                        Logging.Success("endGame");
-                            this.imGuiWindowBridgeEngine.gameStateMessages.Add(new GameStateMessage {isPlaying = false});
+                        this.imGuiWindowBridgeEngine.gameStateMessages.Add(new GameStateMessage {isPlaying = false});
-                            this.imGuiWindowBridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage {Window = isometricparkfna.Messages.Window.MainMenu});});
+                        this.imGuiWindowBridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage {Window = isometricparkfna.Messages.Window.MainMenu});
+                    });
                     Logging.Debug(this.Story.ContinueMaximally());

isometric-park-fna/Simulation.cs ¶ +3 -3

                     public int dead_trees
                     {
-                            get {
+                        get {
-                                    return this.map.iterate_cells().Where(c => (c.status == CellStatus.DeadTree)).Count();
+                            return this.map.iterate_cells().Where(c => (c.status == CellStatus.DeadTree)).Count();
+                        }
                     }
                     public float healthy_percent

isometric-park-fna/UI/Dialog.cs ¶ +11 -11

                     private static bool ContentRemaining(DialogComponent dialogComponent)
                     {
-                            return !String.IsNullOrWhiteSpace(dialogComponent.CurrentDialog)
+                        return !String.IsNullOrWhiteSpace(dialogComponent.CurrentDialog)
-                                    || ((dialogComponent.Options != null) && dialogComponent.Options.Count > 0);
+                               || ((dialogComponent.Options != null) && dialogComponent.Options.Count > 0);
                     }
                     public static void RenderDialog(Entity entity,
                         //I don't know if it's the best design, but it's possible to
                         //get into a state where we're effectively done.but there's still an entity
                         if (show && ContentRemaining(dialogComponent)) {
-                                ImGui.PushFont(font);
+                            ImGui.PushFont(font);
-                                ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None;
+                            ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None;
                             StyleSets.defaultSet.push();
                         //If we're at the end, advance it and hide.
                         if (!ContentRemaining(dialogComponent))
                         {
-                                show = false;
+                            show = false;
-                                paused = false;
+                            paused = false;
-                                bridgeEngine.dialogChoiceMessages.Add(new DialogChoiceMessage
+                            bridgeEngine.dialogChoiceMessages.Add(new DialogChoiceMessage
+                            {
-                                        Entity = entity,
+                                Entity = entity,
-                                        Choice = -1
+                                Choice = -1
-                                    });
+                            });
                         }
                         if (!paused)
                         {

isometric-park-fna/UI/StyleSet.cs ¶ +1 -6

             {
                 public class StyleSet
                 {
                     // public static IMFont
                     public static void pushStyleVarSet(Dictionary<ImGuiStyleVar, float> style_set)
                     {
                     public Dictionary<ImGuiCol, Num.Vector4> WindowColors {get;}
                     public StyleSet(Dictionary<ImGuiStyleVar, float> windowVars,
-                                    Dictionary<ImGuiCol, Num.Vector4> windowColors
+                                    Dictionary<ImGuiCol, Num.Vector4> windowColors)
                     {
                         this.WindowVars = windowVars;
                         StyleSet.popColorSet(this.WindowColors);
                         StyleSet.popStyleVarSet(this.WindowVars);
                     }
                 }
             }

isometric-park-fna/UI/StyleSets.cs ¶ +25 -25

@@ -61,38 +61,38
61	{ImGuiCol.Text, black}	61	{ImGuiCol.Text, black}
62	};	62	};
63		63
64	public static Dictionary<ImGuiCol, Num.Vector4> defaultWindowColorsLight = new Dictionary<ImGuiCol, Num.Vector4> {	64	public static Dictionary<ImGuiCol, Num.Vector4> defaultWindowColorsLight = new Dictionary<ImGuiCol, Num.Vector4> {
65	{ImGuiCol.WindowBg, lightgrey},	65	{ImGuiCol.WindowBg, lightgrey},
66	{ImGuiCol.FrameBg, lightgrey},	66	{ImGuiCol.FrameBg, lightgrey},
67	{ImGuiCol.FrameBgHovered, lightgrey},	67	{ImGuiCol.FrameBgHovered, lightgrey},
68	{ImGuiCol.Header, darkgrey},	68	{ImGuiCol.Header, darkgrey},
69	{ImGuiCol.HeaderHovered, darkgrey},	69	{ImGuiCol.HeaderHovered, darkgrey},
70	{ImGuiCol.HeaderActive, darkgrey},	70	{ImGuiCol.HeaderActive, darkgrey},
71	{ImGuiCol.ButtonHovered, lightgrey},	71	{ImGuiCol.ButtonHovered, lightgrey},
72	{ImGuiCol.ButtonActive, darkgrey},	72	{ImGuiCol.ButtonActive, darkgrey},
73	{ImGuiCol.SliderGrab, darkgrey},	73	{ImGuiCol.SliderGrab, darkgrey},
74	{ImGuiCol.SliderGrabActive, darkgrey},	74	{ImGuiCol.SliderGrabActive, darkgrey},
75		75
76		76
77	{ImGuiCol.Tab, darkgrey},	77	{ImGuiCol.Tab, darkgrey},
78	{ImGuiCol.TabHovered, darkgrey},	78	{ImGuiCol.TabHovered, darkgrey},
79	{ImGuiCol.TabActive, selected},	79	{ImGuiCol.TabActive, selected},
80		80
81	{ImGuiCol.CheckMark, black},	81	{ImGuiCol.CheckMark, black},
82		82
83	{ImGuiCol.TitleBg, title_bar},	83	{ImGuiCol.TitleBg, title_bar},
84	{ImGuiCol.TitleBgActive, selected},	84	{ImGuiCol.TitleBgActive, selected},
85	{ImGuiCol.TitleBgCollapsed, title_bar},	85	{ImGuiCol.TitleBgCollapsed, title_bar},
86		86
87	{ImGuiCol.Border, black},	87	{ImGuiCol.Border, black},
88	{ImGuiCol.BorderShadow, black},	88	{ImGuiCol.BorderShadow, black},
89		89
90	{ImGuiCol.PopupBg, white},	90	{ImGuiCol.PopupBg, white},
91		91
92	{ImGuiCol.Button, grey_transparent},	92	{ImGuiCol.Button, grey_transparent},
93	{ImGuiCol.Text, black}	93	{ImGuiCol.Text, black}
94	};	94	};
95	public static StyleSet defaultSet = new StyleSet(defaultWindowVars, defaultWindowColors);	95	public static StyleSet defaultSet = new StyleSet(defaultWindowVars, defaultWindowColors);
96	}	96	}
97		97
98	}	98	}

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r488:2f1c0b5b9bbe - Mon, 20 Dec 2021 01:02:28

Sign in to your account

Commit r488:2f1c0b5b9bbe public

Author

r488:2f1c0b5b9bbe - Mon, 20 Dec 2021 01:02:28

Commit `r488:2f1c0b5b9bbe` public