Description:
Display tree type.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
| @@ -199,11 +199,23 | |||
|
|
199 | 199 | private set; |
|
|
200 | 200 | } |
|
|
201 | 201 | |
|
|
202 |
public |
|
|
|
202 | public String StatusAdjective { | |
|
|
203 | get { | |
|
|
204 | return this.status.ToString().Replace("Tree", ""); | |
|
|
205 | } | |
|
|
206 | } | |
|
|
207 | ||
|
|
208 | public TreeType Type { | |
|
|
203 | 209 | get; |
|
|
204 | 210 | private set; |
|
|
205 | 211 | } |
|
|
206 | 212 | |
|
|
213 | public String TypeName { | |
|
|
214 | get { | |
|
|
215 | return this.Type.ToString().Replace("Generic", ""); | |
|
|
216 | } | |
|
|
217 | } | |
|
|
218 | ||
|
|
207 | 219 | public Boolean hasTree { |
|
|
208 | 220 | get { |
|
|
209 | 221 | return this.status == CellStatus.LivingTree; |
| @@ -217,7 +229,7 | |||
|
|
217 | 229 | |
|
|
218 | 230 | this.planted = datetime; |
|
|
219 | 231 | |
|
|
220 |
this. |
|
|
|
232 | this.Type = type; | |
|
|
221 | 233 | } |
|
|
222 | 234 | |
|
|
223 | 235 | public void removeTree() { |
| @@ -730,7 +730,7 | |||
|
|
730 | 730 | { |
|
|
731 | 731 | if (this.simulation.map.cells[i][j].hasTree) |
|
|
732 | 732 | { //until we actually simulate: |
|
|
733 |
if (this.simulation.map.cells[i][j]. |
|
|
|
733 | if (this.simulation.map.cells[i][j].Type == TreeType.GenericDeciduous) { | |
|
|
734 | 734 | drawTileAt(i, j, 142, 2); |
|
|
735 | 735 | } |
|
|
736 | 736 | else { |
| @@ -784,9 +784,21 | |||
|
|
784 | 784 | if (MathUtils.BetweenExclusive(this.mouseGrid.X, -1, this.simulation.map.MapWidth) |
|
|
785 | 785 | && MathUtils.BetweenExclusive(this.mouseGrid.Y, -1, this.simulation.map.MapHeight)) |
|
|
786 | 786 | { |
|
|
787 | status_left = String.Format("{0:},{1:} {2} ({3})", this.mouseGrid.X, this.mouseGrid.Y, | |
|
|
788 |
|
|
|
|
789 | this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused")); | |
|
|
787 | var treeStatus = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status; | |
|
|
788 | var treeStatusAdjective = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].StatusAdjective; | |
|
|
789 | var treeType = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].TypeName; | |
|
|
790 | if (treeStatus != CellStatus.Clear) | |
|
|
791 | { | |
|
|
792 | status_left = String.Format("{0:},{1:} {2} {3} ({4})", this.mouseGrid.X, this.mouseGrid.Y, | |
|
|
793 | treeStatusAdjective, | |
|
|
794 | treeType, | |
|
|
795 | this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused")); | |
|
|
796 | } | |
|
|
797 | else { | |
|
|
798 | status_left = String.Format("{0:},{1:} {2} ({3})", this.mouseGrid.X, this.mouseGrid.Y, | |
|
|
799 | treeStatusAdjective, | |
|
|
800 | this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused")); | |
|
|
801 | } | |
|
|
790 | 802 | } |
|
|
791 | 803 | |
|
|
792 | 804 | String header_left = String.Format("${0:}|{1:} \ue124", this.simulation.money, this.simulation.map.tree_count); |
You need to be logged in to leave comments.
Login now