alysbrooks-public » games » isometric-park-fna

Commit r359:e0b0d93962c3 public

parent | child
Description:
Add trespassing policy.
Commit status:
[Not Reviewed]
References:
m4-beginning
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r359:e0b0d93962c3 -

Show file before | Show file after | Show commentsHide comments
@@ -0,0 +1,21
1 using Encompass;
2 using System;
3 using System.ComponentModel.DataAnnotations;
4 // using System.ComponentModel;
5
6 namespace isometricparkfna.Components {
7
8 public enum EnforcementLevel {
9 Unspecified,
10 // [Display(Name = "No Enforcement")]
11 NoEnforcement,
12 // [Display(Name = "Rangers, warnings")]
13 EnforcedWithWarnings,
14 // [Display(Name = "Rangers, citations")]
15 EnforcedWithFines
16 }
17
18 public struct TrespassingPolicyComponent : IComponent {
19 public EnforcementLevel tresspassingPolicy;
20 }
21 }
Show file before | Show file after | Show commentsHide comments
@@ -0,0 +1,56
1 using System;
2
3 using Encompass;
4
5 using isometricparkfna.Messages;
6 using isometricparkfna.Components;
7
8 namespace isometricparkfna.Engines
9 {
10
11 [Receives(typeof(SetTrespassingPolicyMessage))]
12 [Reads(typeof(TrespassingPolicyComponent))]
13 [Writes(typeof(TrespassingPolicyComponent),
14 typeof(BudgetLineComponent))]
15 public class PolicyEngine : Engine
16 {
17
18 public PolicyEngine()
19 {
20 }
21
22
23 public override void Update(double dt)
24 {
25 foreach (ref readonly var message
26 in ReadMessages<SetTrespassingPolicyMessage>())
27 {
28 foreach (ref readonly var entity
29 in ReadEntities<TrespassingPolicyComponent>())
30 {
31
32 SetComponent<TrespassingPolicyComponent>(entity,
33 new TrespassingPolicyComponent {tresspassingPolicy
34 = message.newEnforcementLevel });
35
36 var newCost =message.newEnforcementLevel switch {
37 EnforcementLevel.NoEnforcement => 0,
38 EnforcementLevel.EnforcedWithWarnings => 100,
39 EnforcementLevel.EnforcedWithFines => 100,
40
41
42 };
43
44
45 SetComponent<BudgetLineComponent>(entity,
46 new BudgetLineComponent {category = "Enforcement",
47 amount = newCost
48 });
49
50 }
51 }
52
53 }
54
55 }
56 }
Show file before | Show file after | Show commentsHide comments
@@ -0,0 +1,9
1 using Encompass;
2 using isometricparkfna.Components;
3
4 namespace isometricparkfna.Messages {
5
6 public struct SetTrespassingPolicyMessage : IMessage {
7 public EnforcementLevel newEnforcementLevel;
8 }
9 }
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -18,9 +18,11
18 typeof(GameStateMessage),
18 typeof(GameStateMessage),
19 typeof(GameStateMessage),
19 typeof(GameStateMessage),
20 typeof(SetResolutionMessage),
20 typeof(SetResolutionMessage),
21 typeof(SetFontMessage))]
21 typeof(SetFontMessage),
22 typeof(SetTrespassingPolicyMessage))]
22 [Reads(typeof(VisibilityComponent),
23 [Reads(typeof(VisibilityComponent),
23 typeof(WindowTypeComponent)
24 typeof(WindowTypeComponent),
25 typeof(TrespassingPolicyComponent)
24 //, typeof(SelectedComponent)
26 //, typeof(SelectedComponent)
25 )]
27 )]
26 // [Writes(typeof(SelectedComponent))]
28 // [Writes(typeof(SelectedComponent))]
@@ -35,6 +37,7
35 public List<GameStateMessage> gameStateMessages;
37 public List<GameStateMessage> gameStateMessages;
36 public List<SetResolutionMessage> resolutionMessages;
38 public List<SetResolutionMessage> resolutionMessages;
37 public List<SetFontMessage> fontMessages;
39 public List<SetFontMessage> fontMessages;
40 public List<SetTrespassingPolicyMessage> trespassingPolicyMessages;
38
41
39 bool showBudget {get;}
42 bool showBudget {get;}
40 bool showForest {get;}
43 bool showForest {get;}
@@ -60,6 +63,7
60 this.gameStateMessages = new List<GameStateMessage>();
63 this.gameStateMessages = new List<GameStateMessage>();
61 this.resolutionMessages = new List<SetResolutionMessage>();
64 this.resolutionMessages = new List<SetResolutionMessage>();
62 this.fontMessages = new List<SetFontMessage>();
65 this.fontMessages = new List<SetFontMessage>();
66 this.trespassingPolicyMessages = new List<SetTrespassingPolicyMessage>();
63 this.windowStatuses = new Dictionary<Window, bool>();
67 this.windowStatuses = new Dictionary<Window, bool>();
64
68
65
69
@@ -124,6 +128,11
124 message.fontSize);
128 message.fontSize);
125 }
129 }
126
130
131 foreach (var message in this.trespassingPolicyMessages)
132 {
133 SendMessage(message);
134 }
135
127
136
128
137
129 foreach(var entity in ReadEntities<WindowTypeComponent>())
138 foreach(var entity in ReadEntities<WindowTypeComponent>())
@@ -142,6 +151,7
142 this.gameStateMessages.Clear();
151 this.gameStateMessages.Clear();
143 this.resolutionMessages.Clear();
152 this.resolutionMessages.Clear();
144 this.fontMessages.Clear();
153 this.fontMessages.Clear();
154 this.trespassingPolicyMessages.Clear();
145 }
155 }
146 }
156 }
147 } No newline at end of file
157 }
Show file before | Show file after | Show commentsHide comments
@@ -64,29 +64,31
64 }
64 }
65
65
66 decimal new_contract_amount = 0M;
66 decimal new_contract_amount = 0M;
67 decimal new_enforcement_amount = 0M;
68 // decimal new_upkeep_amount = 0M;
67
69
68 foreach (ref readonly var entity in ReadEntities<BudgetLineComponent>())
70 foreach (ref readonly var entity in ReadEntities<BudgetLineComponent>())
69 {
71 {
70 ref readonly var budgetComponent = ref GetComponent<BudgetLineComponent>(entity);
72 ref readonly var budgetComponent = ref GetComponent<BudgetLineComponent>(entity);
71 var status = GetComponent<ContractStatusComponent>(entity).status;
72
73
73 // SetComponent(entity, new BudgetComponent{currentBudget = this.simulation.latestBudget,
74 // SetComponent(entity, new BudgetComponent{currentBudget = this.simulation.latestBudget,
74 // priorBudget = this.simulation.previousBudget});
75 // priorBudget = this.simulation.previousBudget});
75 switch (budgetComponent.category)
76 switch (budgetComponent.category)
76 {
77 {
77 case "Contracts":
78 case "Contracts":
78
79 var status = GetComponent<ContractStatusComponent>(entity).status;
79 if (status == ContractStatus.Accepted)
80 if (status == ContractStatus.Accepted)
80 {
81 {
81 new_contract_amount += budgetComponent.amount;
82 new_contract_amount += budgetComponent.amount;
82 }
83 }
83 break;
84 break;
85 case "Enforcement":
86 new_enforcement_amount += budgetComponent.amount;
87 break;
84 }
88 }
85
89
86 }
90 }
87
91
88
89
90 if (this.ticksToSend > 0)
92 if (this.ticksToSend > 0)
91 {
93 {
92
94
@@ -139,6 +141,7
139 this.ticksToSend = 0;
141 this.ticksToSend = 0;
140
142
141 simulation.contracts = new_contract_amount;
143 simulation.contracts = new_contract_amount;
144 simulation.enforcement = new_enforcement_amount;
142
145
143 }
146 }
144
147
Show file before | Show file after | Show commentsHide comments
@@ -266,6 +266,7
266
266
267 WorldBuilder.AddEngine(new ContractSpawner(simulation.map.MapWidth, simulation.map.MapHeight, this.simulation, this.grammar));
267 WorldBuilder.AddEngine(new ContractSpawner(simulation.map.MapWidth, simulation.map.MapHeight, this.simulation, this.grammar));
268 WorldBuilder.AddEngine(new OrganizationSpawner(this.simulation, this.grammar));
268 WorldBuilder.AddEngine(new OrganizationSpawner(this.simulation, this.grammar));
269 WorldBuilder.AddEngine(new PolicyEngine());
269
270
270 WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.batch, this.monoFont), 1);
271 WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.batch, this.monoFont), 1);
271 WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(this, debugWindow.monoFont, debugWindow.italicFont, this.imGuiWindowBridgeEngine, this.gdm) , 2);
272 WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(this, debugWindow.monoFont, debugWindow.italicFont, this.imGuiWindowBridgeEngine, this.gdm) , 2);
@@ -300,6 +301,14
300
301
301 WorldBuilder.SetComponent(gameEntity, new GameStateComponent { isPlaying = false});
302 WorldBuilder.SetComponent(gameEntity, new GameStateComponent { isPlaying = false});
302
303
304 var policyEntity = WorldBuilder.CreateEntity();
305 WorldBuilder.SetComponent(policyEntity,
306 new TrespassingPolicyComponent { tresspassingPolicy = EnforcementLevel.NoEnforcement});
307 WorldBuilder.SetComponent(policyEntity,
308 new BudgetLineComponent { });
309
310
311
303
312
304 var area = WorldBuilder.CreateEntity();
313 var area = WorldBuilder.CreateEntity();
305 var size = 5;
314 var size = 5;
Show file before | Show file after | Show commentsHide comments
@@ -26,6 +26,8
26 public decimal upkeep;
26 public decimal upkeep;
27 public decimal tree_planting;
27 public decimal tree_planting;
28 public decimal tree_clearing;
28 public decimal tree_clearing;
29 public decimal miscellaneous;
30 public decimal enforcement;
29
31
30
32
31 public decimal final_money;
33 public decimal final_money;
@@ -87,6 +89,7
87 public SimulationBridgeEngine BridgeEngine { get; private set; }
89 public SimulationBridgeEngine BridgeEngine { get; private set; }
88 // public SimulationBridgeEngine bridgeEngine {get;}
90 // public SimulationBridgeEngine bridgeEngine {get;}
89 public decimal contracts;
91 public decimal contracts;
92 public decimal enforcement;
90
93
91 public Budget latestBudget
94 public Budget latestBudget
92 {
95 {
@@ -296,6 +299,7
296 trees = this.map.tree_count,
299 trees = this.map.tree_count,
297 subsidy = 1000,
300 subsidy = 1000,
298 contracts = this.contracts,
301 contracts = this.contracts,
302 enforcement = this.enforcement,
299 upkeep = (int)(this.map.tree_count * 1.5),
303 upkeep = (int)(this.map.tree_count * 1.5),
300 tree_planting = this.tree_planting * Simulation.TREE_PLANT_COST,
304 tree_planting = this.tree_planting * Simulation.TREE_PLANT_COST,
301 tree_clearing = this.tree_clearing * Simulation.TREE_CLEAR_COST
305 tree_clearing = this.tree_clearing * Simulation.TREE_CLEAR_COST
@@ -314,7 +318,7
314 {
318 {
315
319
316 this.money = budget.money
320 this.money = budget.money
317 - (budget.upkeep + budget.tree_planting + budget.tree_clearing)
321 - (budget.upkeep + budget.tree_planting + budget.tree_clearing + budget.enforcement)
318 + (budget.subsidy + budget.contracts);
322 + (budget.subsidy + budget.contracts);
319
323
320
324
Show file before | Show file after | Show commentsHide comments
@@ -109,6 +109,7
109 batch.DrawString(font, String.Format("Upkeep.................${0:}....${1:}", this.budget.upkeep, this.previous_budget.upkeep), new Vector2(x, bar_height * 10 + y), Color.Black);
109 batch.DrawString(font, String.Format("Upkeep.................${0:}....${1:}", this.budget.upkeep, this.previous_budget.upkeep), new Vector2(x, bar_height * 10 + y), Color.Black);
110 batch.DrawString(font, String.Format("Tree Planting..........${0:}....${1:}", this.budget.tree_planting, this.previous_budget.tree_planting), new Vector2(x, bar_height * 11 + y), Color.Black);
110 batch.DrawString(font, String.Format("Tree Planting..........${0:}....${1:}", this.budget.tree_planting, this.previous_budget.tree_planting), new Vector2(x, bar_height * 11 + y), Color.Black);
111 batch.DrawString(font, String.Format("Tree Clearing..........${0:}....${1:}", this.budget.tree_clearing, this.previous_budget.tree_clearing), new Vector2(x, bar_height * 12 + y), Color.Black);
111 batch.DrawString(font, String.Format("Tree Clearing..........${0:}....${1:}", this.budget.tree_clearing, this.previous_budget.tree_clearing), new Vector2(x, bar_height * 12 + y), Color.Black);
112 batch.DrawString(font, String.Format("Enforcement............${0:}....${1:}", this.budget.enforcement, this.previous_budget.enforcement), new Vector2(x, bar_height * 13 + y), Color.Black);
112
113
113 Color cashflow_color = Color.Black;
114 Color cashflow_color = Color.Black;
114 if (this.budget.cashflow < 0) {
115 if (this.budget.cashflow < 0) {
@@ -119,8 +120,8
119 final_color = Color.Red;
120 final_color = Color.Red;
120 }
121 }
121
122
122 batch.DrawString(font, String.Format("Cashflow.............${0:}....${1:}", this.budget.cashflow, this.previous_budget.cashflow), new Vector2(x, bar_height * 14 + y), cashflow_color);
123 batch.DrawString(font, String.Format("Cashflow.............${0:}....${1:}", this.budget.cashflow, this.previous_budget.cashflow), new Vector2(x, bar_height * 15 + y), cashflow_color);
123 batch.DrawString(font, String.Format("Ending Funds.........${0:}....${1:}", this.budget.final_money, this.previous_budget.final_money), new Vector2(x, bar_height * 15 + y), final_color);
124 batch.DrawString(font, String.Format("Ending Funds.........${0:}....${1:}", this.budget.final_money, this.previous_budget.final_money), new Vector2(x, bar_height * 16 + y), final_color);
124
125
125
126
126 FilledRectangle.drawFilledRectangle(batch, new Rectangle(50, 50, 50, 50), new Color (0, 0,0, 0), 0.99f);
127 FilledRectangle.drawFilledRectangle(batch, new Rectangle(50, 50, 50, 50), new Color (0, 0,0, 0), 0.99f);
Show file before | Show file after | Show commentsHide comments
@@ -1,8 +1,10
1 using System;
2 using Num = System.Numerics;
3
1 using ImGuiNET;
4 using ImGuiNET;
2
5
3 using Num = System.Numerics;
4
5 using isometricparkfna.Messages;
6 using isometricparkfna.Messages;
7 using isometricparkfna.Components;
6 using isometricparkfna.Engines;
8 using isometricparkfna.Engines;
7
9
8 namespace isometricparkfna.UI
10 namespace isometricparkfna.UI
@@ -11,6 +13,10
11 public static class ForestWindow
13 public static class ForestWindow
12 {
14 {
13 public static bool hadFocus = false;
15 public static bool hadFocus = false;
16
17 private static bool enforceTresspassing1 = false;
18 private static string enforceTresspassing2 = "None";
19
14 public static void Render(bool show, ImFontPtr font, Simulation sim, ImGuiWindowBridgeEngine engine)
20 public static void Render(bool show, ImFontPtr font, Simulation sim, ImGuiWindowBridgeEngine engine)
15 {
21 {
16 bool newShow = show;
22 bool newShow = show;
@@ -43,6 +49,53
43 ImGui.SliderInt("Tree Clearing", ref new_tree_clearing, 0, Simulation.MAX_TREES_TO_CLEAR, string.Format("%d (${0})", new_tree_clearing*Simulation.TREE_CLEAR_COST));
49 ImGui.SliderInt("Tree Clearing", ref new_tree_clearing, 0, Simulation.MAX_TREES_TO_CLEAR, string.Format("%d (${0})", new_tree_clearing*Simulation.TREE_CLEAR_COST));
44 sim.tree_clearing = new_tree_clearing;
50 sim.tree_clearing = new_tree_clearing;
45
51
52 ImGui.Checkbox("Enforce Trespassing.", ref enforceTresspassing1);
53
54 ImGui.Text("Enforce tresspassing?");
55 ImGui.SameLine();
56
57 if (ImGui.BeginCombo("##tresspassing2", enforceTresspassing2))
58 {
59
60 // if ( ImGui.Selectable("None"))
61 // {
62 // enforceTresspassing2 = "None";
63 // }
64 // if (ImGui.Selectable("Rangers, warnings"))
65 // {
66 // enforceTresspassing2 = "Rangers, warnings";
67 // }
68 // if (ImGui.Selectable("Rangers, citations"))
69 // {
70 // enforceTresspassing2 = "Rangers, citations";
71 // }
72
73 foreach (EnforcementLevel option in EnforcementLevel.GetValues(typeof(EnforcementLevel)))
74 {
75
76 if (ImGui.Selectable(option.ToString()))
77 {
78 enforceTresspassing2 = option.ToString();
79 }
80 }
81
82 ImGui.EndCombo();
83 }
84 ImGui.SameLine();
85 ImGui.TextDisabled("(?)");
86 if (ImGui.IsItemHovered())
87 {
88 var rect = ImGui.GetItemRectMax();
89 ImGui.SetNextWindowPos(rect + new Num.Vector2(15, 0));
90 ImGui.BeginTooltip();
91 ImGui.Text("Enforcing tresspassing lowers upkeep, but costs money.\n\nRacial minorities may also be targeted unfairly.");
92 ImGui.EndTooltip();
93 }
94
95
96
97 ImGui.Separator();
98
46 ImGui.Text(string.Format("Crowded Trees: {0}", sim.crowded_trees ));
99 ImGui.Text(string.Format("Crowded Trees: {0}", sim.crowded_trees ));
47 ImGui.Text(string.Format("Percent Healthy Trees: {0:F2}", sim.healthy_percent));
100 ImGui.Text(string.Format("Percent Healthy Trees: {0:F2}", sim.healthy_percent));
48 ImGui.Text(string.Format("Average Age of Trees: {0:F2}", sim.average_tree_age));
101 ImGui.Text(string.Format("Average Age of Trees: {0:F2}", sim.average_tree_age));
@@ -51,9 +104,11
51 if (ImGui.Button("Okay"))
104 if (ImGui.Button("Okay"))
52 {
105 {
53 show = false;
106 show = false;
107 Logging.Spy(new {newEnforcementLevel = (EnforcementLevel)Enum.Parse(typeof(EnforcementLevel), enforceTresspassing2)});
108 engine.trespassingPolicyMessages.Add(new SetTrespassingPolicyMessage{newEnforcementLevel = (EnforcementLevel)Enum.Parse(typeof(EnforcementLevel), enforceTresspassing2)});
54 }
109 }
55
110
56 ImGui.End();
111 ImGui.End();
57 ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left;
112 ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left;
58 StyleSets.defaultSet.pop();
113 StyleSets.defaultSet.pop();
59 ImGui.PopFont();
114 ImGui.PopFont();
You need to be logged in to leave comments. Login now