Description:
Clean up Spy messages.
Delete some Spy logging messages that aren't necessary anymore and convert a
few others to different levels.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -26,7 +26,7 | |||||
|
26 | foreach (var entity in ReadEntities<GameStateComponent>()) |
|
26 | foreach (var entity in ReadEntities<GameStateComponent>()) |
|
27 | { |
|
27 | { |
|
28 | var state = GetComponent<GameStateComponent>(entity).isPlaying; |
|
28 | var state = GetComponent<GameStateComponent>(entity).isPlaying; |
|
29 |
Logging. |
|
29 | Logging.Debug("Changing state: ", state); |
|
30 |
|
30 | ||
|
31 | SetComponent(entity, new GameStateComponent { isPlaying = message.isPlaying }); |
|
31 | SetComponent(entity, new GameStateComponent { isPlaying = message.isPlaying }); |
|
32 | } |
|
32 | } |
@@ -51,10 +51,6 | |||||
|
51 |
|
51 | ||
|
52 | foreach (ref readonly var windowMessage in ReadMessages<SetWindowVisibilityMessage>()) |
|
52 | foreach (ref readonly var windowMessage in ReadMessages<SetWindowVisibilityMessage>()) |
|
53 | { |
|
53 | { |
|
54 | Logging.Spy(windowMessage, "message"); |
|
||
|
55 | Logging.Spy(windowMessage.Entity, "message.Entity"); |
|
||
|
56 | Logging.Spy(windowMessage.Entity.ID, "message.Entity.ID"); |
|
||
|
57 | Logging.Spy(windowMessage.Visibility, "message.Visibility"); |
|
||
|
58 | foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>()) |
|
54 | foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>()) |
|
59 | { |
|
55 | { |
|
60 | Logging.Spy(entity.ID, "ID"); |
|
56 | Logging.Spy(entity.ID, "ID"); |
@@ -68,9 +64,6 | |||||
|
68 | } |
|
64 | } |
|
69 | foreach (ref readonly var windowMessage in ReadMessages<ToggleWindowMessage>()) |
|
65 | foreach (ref readonly var windowMessage in ReadMessages<ToggleWindowMessage>()) |
|
70 | { |
|
66 | { |
|
71 | Logging.Spy(windowMessage, "message"); |
|
||
|
72 | Logging.Spy(windowMessage.Window, "message.Window"); |
|
||
|
73 | Logging.Spy(windowMessage.Entity, "message.Entity"); |
|
||
|
74 | foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>()) |
|
67 | foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>()) |
|
75 | { |
|
68 | { |
|
76 | if (EntityExists(windowMessage.Entity) && entity.ID == windowMessage.Entity.ID) |
|
69 | if (EntityExists(windowMessage.Entity) && entity.ID == windowMessage.Entity.ID) |
@@ -83,8 +76,6 | |||||
|
83 | } |
|
76 | } |
|
84 | foreach (ref readonly var windowMessage in ReadMessages<ToggleWindowTypeMessage>()) |
|
77 | foreach (ref readonly var windowMessage in ReadMessages<ToggleWindowTypeMessage>()) |
|
85 | { |
|
78 | { |
|
86 | Logging.Spy(windowMessage, "message"); |
|
||
|
87 | Logging.Spy(windowMessage.Window, "message.Window"); |
|
||
|
88 | foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>()) |
|
79 | foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>()) |
|
89 | { |
|
80 | { |
|
90 |
|
81 | ||
@@ -94,7 +85,6 | |||||
|
94 | var visibilityComponent = GetComponent<VisibilityComponent>(entity); |
|
85 | var visibilityComponent = GetComponent<VisibilityComponent>(entity); |
|
95 | SetComponent(entity, new VisibilityComponent { visible = !visibilityComponent.visible }); |
|
86 | SetComponent(entity, new VisibilityComponent { visible = !visibilityComponent.visible }); |
|
96 | } |
|
87 | } |
|
97 |
|
|||
|
98 | } |
|
88 | } |
|
99 | } |
|
89 | } |
|
100 |
|
90 | ||
@@ -137,12 +127,10 | |||||
|
137 | SetComponent(entity, new SelectedComponent {Type = SelectionType.Area, |
|
127 | SetComponent(entity, new SelectedComponent {Type = SelectionType.Area, |
|
138 | selected = false |
|
128 | selected = false |
|
139 | }); |
|
129 | }); |
|
140 | } |
|
130 | } |
|
141 | } |
|
131 | } |
|
142 | } |
|
132 | } |
|
143 | } |
|
133 | } |
|
144 |
|
134 | } | |
|
145 |
|
135 | } | |
|
146 | } |
|
||
|
147 | } |
|
||
|
148 | } |
|
136 | } |
@@ -285,7 +285,7 | |||||
|
285 | this.imGuiWindowBridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage {Window = isometricparkfna.Messages.Window.MainMenu}); |
|
285 | this.imGuiWindowBridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage {Window = isometricparkfna.Messages.Window.MainMenu}); |
|
286 | }); |
|
286 | }); |
|
287 |
|
287 | ||
|
288 | Logging.Debug(this.Story.ContinueMaximally()); |
|
288 | Logging.Debug("Continuing Maximally: " + this.Story.ContinueMaximally().ToString()); |
|
289 |
|
289 | ||
|
290 | WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm, |
|
290 | WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm, |
|
291 | this.simulation.map.MapHeight, this.simulation.map.MapWidth)); |
|
291 | this.simulation.map.MapHeight, this.simulation.map.MapWidth)); |
@@ -10,12 +10,10 | |||||
|
10 | Uncensored, |
|
10 | Uncensored, |
|
11 | Minced, |
|
11 | Minced, |
|
12 | Removed |
|
12 | Removed |
|
13 |
|
|||
|
14 | } |
|
13 | } |
|
15 |
|
14 | ||
|
16 | public class Options |
|
15 | public class Options |
|
17 | { |
|
16 | { |
|
18 |
|
|||
|
19 | public string fontName; |
|
17 | public string fontName; |
|
20 | public int fontSize; |
|
18 | public int fontSize; |
|
21 | public ProfanityLevel profanitySetting; |
|
19 | public ProfanityLevel profanitySetting; |
@@ -38,7 +36,6 | |||||
|
38 | public static void writeOptions(string fontName, int fontSize, ProfanityLevel profanitySetting, |
|
36 | public static void writeOptions(string fontName, int fontSize, ProfanityLevel profanitySetting, |
|
39 | float soundEffectVolume, bool soundEffectMuted) |
|
37 | float soundEffectVolume, bool soundEffectMuted) |
|
40 | { |
|
38 | { |
|
41 |
|
|||
|
42 | var options = new Options(fontName, fontSize, profanitySetting, soundEffectVolume, |
|
39 | var options = new Options(fontName, fontSize, profanitySetting, soundEffectVolume, |
|
43 | soundEffectMuted); |
|
40 | soundEffectMuted); |
|
44 |
|
41 | ||
@@ -53,14 +50,10 | |||||
|
53 | public static Options readOptions() |
|
50 | public static Options readOptions() |
|
54 | { |
|
51 | { |
|
55 | var json = File.ReadAllText(@"options.json"); |
|
52 | var json = File.ReadAllText(@"options.json"); |
|
56 |
Logging. |
|
53 | Logging.Debug(new {json=json}.ToString()); |
|
57 |
|
54 | ||
|
58 | Options options = JsonConvert.DeserializeObject<Options>(json); |
|
55 | Options options = JsonConvert.DeserializeObject<Options>(json); |
|
59 |
|
56 | ||
|
60 | Logging.Spy(new {name=options.fontName, |
|
||
|
61 | size=options.fontSize, |
|
||
|
62 | vol=options.SoundEffectVolume |
|
||
|
63 | }); |
|
||
|
64 | Logging.Success("Read options."); |
|
57 | Logging.Success("Read options."); |
|
65 |
|
58 | ||
|
66 | return options; |
|
59 | return options; |
You need to be logged in to leave comments.
Login now