diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index 7a76dd3093ef3fc7732972f332298d6400a0b45e..9d9e65074159a1e5f88dfb51d2bf09ed3b7fd55b GIT binary patch literal 11415 zc%1E84R96J72bXSn*fR0Dz*p#`ITf}0{J08fJZ_gLINb1su1G7_wGxU?A!O)-4_fh zprRJ)F9=hpI-ueYDn*KRYIO!G;!LeN#e%hpwnc>^O09H8?Et-Jv%A^N-c3k&afTT- zle3#W=YHoqXYbFsyP;@`qR!$2&T#Z|VX?THk4OnQ5mVUdDPD-O3plw&X3G;2%FU@q zlFTQ>vVtPEfX!#~b92g5f|8O@nTS$~#0j}M^HO1fkIY7G3lc3zEDPt4j}^sAVg&`! zqI_;V=LKg&$v*1ZWCg|R6iz{4#l(04seic#wW}}-K|m1&Q;^wNoZPH%VF3Ya#*Kvs zM3<&MY>+W0!9^>%h?0=}T0EJUZh0b}+@qV zJeZQDpumTN@r0NN7P3WoT#^rJXxGODHYy0d0JfairDfGz7JN!bhH%+RNNl?X+B3L) zsJ(q6!U@50BnX_;4pht*jKfd5G~W>$dWH&W8h0 zyR@oJi3%S_Y#ow#PT-ew@UYdk{c+p+UI)~5vIb!68NJ4?NyRbSh^#_oVW<&ZhG^tA z8=Kbl+N*P>F2T5?yQEMdam#qINwvNdTTkgZ3(M2L3}cMx(xW9uKk7C|6`aDUrZ8$s zgUyLJ3UWf59F$NpAqROG-%v1K9v*Tnc`=a-R@Q`qVO|VYpm3@Q{!*J?eqIk2#^M}a zT&hA{ab5$;2xuUNnRZ@`0OiVV6K>)D6Kr15d+w&*@>7g7xz|V-A={_Th0GujSAiG| zVhD&F5JN!>193Ho;UGqU7ztt&h|wU%fVc+4SP;1&@<6a4f*|s-@PebU-L6h!EA^EL zCTVv(5%u8T78fUaq9`f*WLUXmucWjh$rTgvBH(hlC?=5G8M&?*F9T6FB+Dos7TRjK zIGS;@f<%~jU|FLvDYpj?@bMSr$t#)3)-<1I@_ExvLJpvIDtU!kWr zm!zGcYx79jN?ps69?eW$8zi-zrEBv^+A2-k?^=9OV_JhdD&ImVd(WxxEh*uOB1Odo zrQ-`x{)AF5jNBeQJ6LVK&72&n@rd}oE7{^swkU4gN4znCYm)tuWQvm_&0ter<%;lr ze9;^dniy=NmY7N)l8B-(t}Oj6s4dCyl9!X~6v@xab>J!kS|(E=48rj7cuK920}_gJ z$s~$WwBHXEHRX1@T#z3R?Q(VM7=ZvCC^8Zy#`va`)Lva^A@N8yqMOxDFCpT4pL9c|ozlb+!y~{G-_*-EQ)7VJCK7sP=#9-%_d6mIo(z1%mQe69f%*78OR+&x zraInQ5O->f0UMKb ztE@rY{sRuvJHY=0Bd|NM%<8mDWmbdXT_EnZ#nEPt<7R6dYw)SI6IhyPuLXCd2JK&T zo?Y$*qx(SIZ=<}_OgU+#{7~P_F6+S6M1$`7ZpXvJ&}svSjW+(gnSZmD|E3>kJZuKv zlZ=3Vg{59MX&Yqb5wLp{#ACJ)ICBU$Swq;0PxGxJHFaaKqgSW{B=_e@j9RDO( zYyjqVL*y4PFjK1-#4j^7S`$_%2acvjE7hm|FiG9#1VCdF=&5E z*_W=*!0vMpM{TSJnpt0AWqq9LtEKA;@K$AzK0$R<{a=FqD-b7bWV6j=v#ezQL#4aw z{|0&h?DDgdqygK@R03hWAtW(yt(Fz$l%B~2jyb;0mg9Pd9MiBtueCuha)fTMK`(ZK z4x6F>s{=$Gp^*(b<^;Wj$XalOj@zI`CuoTXtvEubY|yPv(94O?w>m=KW`kbg1bqiZ z%JphT=(}vtcRN9^B|_ip2z{Ro`hF+qb;N``>_)bz(8FcWIzDKqy9fH>_l$IX&p1Pw-WOyr zP*gESy+!FI*V!}eC6{Lv{^QIUbIAptMj1E0_P&0xV_oc6M#u8dMm3+oz`qYNK3li? z&fKlOwRbB9UuV7HIEU`H&7p5P&7p5mq?!M1N9cEK(C<1yzej{V=m>qt2K~Mh^oK;~ z!;a7&+n_&jf<8i#78TedZlNxOg5q9h8&jCNiA-UJHkkI;Mq(C> SODllS34kF1&~Tx0$^1XTx{7}Q diff --git a/isometric-park-fna/Engines/Spawners/ContractSpawner.cs b/isometric-park-fna/Engines/Spawners/ContractSpawner.cs --- a/isometric-park-fna/Engines/Spawners/ContractSpawner.cs +++ b/isometric-park-fna/Engines/Spawners/ContractSpawner.cs @@ -106,12 +106,14 @@ int contract_amount = random_generator.Next(CONTRACT_MINIMUM, CONTRACT_MAXIMUM); + var deltaTrees = random_generator.Next(-12, 0); + // AddComponent AddComponent(contract, new AreaComponent { squares = squares }); AddComponent(contract, new NameComponent { DisplayName = message.name }); AddComponent(contract, new SelectedComponent { selected = false }); AddComponent(contract, new ContractStatusComponent { status = ContractStatus.Proposed, date = this.simulation.DateTime }); - AddComponent(contract, new TreeDeltaComponent { deltaTrees = -1 }); + AddComponent(contract, new TreeDeltaComponent { deltaTrees = deltaTrees }); AddComponent(contract, new BudgetLineComponent { category = "Contracts", diff --git a/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs b/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs --- a/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs +++ b/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs @@ -39,7 +39,7 @@ case Window.Contracts: var contracts = ReadEntities(); - var contract_data = new List<(Entity, string, ContractStatus, decimal)>(); + var contract_data = new List<(Entity, string, ContractStatus, decimal, int)>(); // var names = contracts.Select(entity => GetComponent(entity).DisplayName) foreach(var e in contracts) @@ -47,7 +47,8 @@ var name = GetComponent(e).DisplayName; var status = GetComponent(e).status; var amount = GetComponent(e).amount; - contract_data.Add((e, name, status, amount)); + var tree_delta = GetComponent(e).deltaTrees; + contract_data.Add((e, name, status, amount, tree_delta)); } diff --git a/isometric-park-fna/UI/ContractsWindow.cs b/isometric-park-fna/UI/ContractsWindow.cs --- a/isometric-park-fna/UI/ContractsWindow.cs +++ b/isometric-park-fna/UI/ContractsWindow.cs @@ -20,8 +20,10 @@ public static decimal selected_amount; public static bool show_all; + private static int selected_tree_delta; - public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine engine, List<(Entity entity, string name, ContractStatus status, decimal amount)> contracts) + public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine engine, + List<(Entity entity, string name, ContractStatus status, decimal amount, int delta_trees)> contracts) { bool newShow = true; @@ -70,6 +72,7 @@ { ContractsWindow.selected_status = contract.status; ContractsWindow.selected_amount = contract.amount; + ContractsWindow.selected_tree_delta = contract.delta_trees; } @@ -106,6 +109,7 @@ ImGui.Separator(); ImGui.Text(string.Format("Amount: ${0}/mo.", ContractsWindow.selected_amount)); + ImGui.Text(string.Format("Trees: {0}", ContractsWindow.selected_tree_delta)); if (selected_status == ContractStatus.Proposed) { if (ImGui.Button("Select"))