Skip to content

Commit 820353e

Browse files
committed
Show Buildings(?!) :|
1 parent 0f6db1c commit 820353e

29 files changed

+20
-4
lines changed

civilization/src/main/java/app/models/Building.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,9 @@ public TechnologyEnum getRequiredTechnology() {
6060
public void setRequiredTechnology(TechnologyEnum requiredTechnology) {
6161
this.requiredTechnology = requiredTechnology;
6262
}
63+
64+
@Override
65+
public String toString() {
66+
return name;
67+
}
6368
}

civilization/src/main/java/app/models/BuildingEnum.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,9 @@ public static BuildingEnum getBuildingEnumByName(String name) {
8080
public static BuildingEnum getBuildingEnumByBuilding(Building building){
8181
return getBuildingEnumByName(building.getName());
8282
}
83+
84+
@Override
85+
public String toString() {
86+
return name;
87+
}
8388
}

civilization/src/main/java/app/models/City.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class City {
2525
private ArrayList<Citizen> citizens = new ArrayList<>();
2626
private ArrayList<Improvement> improvements = new ArrayList<>();
2727

28-
private HashMap<BuildingEnum,Building> previouslyBuiltBuildings;
28+
private HashMap<BuildingEnum,Building> previouslyBuiltBuildings = new HashMap<>();
2929
private Building buildingUnderProduct;
3030
private Unit unitUnderProduct;
3131
private int productionUnderProductTern;

civilization/src/main/java/app/views/GameViewController.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,13 @@ public void handle(MouseEvent mouseEvent) {
315315
selectCity(city);
316316
}
317317
});
318-
Tooltip tip = new Tooltip(city.getName() + "\nOwner: " + city.getCivilization().getCivilizationName() + "\nGarrison: " + city.isGarrison());
318+
StringBuilder str = new StringBuilder();
319+
str.append(city.getName() + "\n");
320+
str.append("Owner: " + city.getCivilization().getCivilizationName() + "\n");
321+
str.append("Garrison: " + city.isGarrison() + "\n");
322+
str.append("Buliding under Construction: " + city.getBuildingUnderProduct() + "\n");
323+
str.append("Buildings: " + city.getPreviouslyBuiltBuildings() + "\n");
324+
Tooltip tip = new Tooltip(str.toString());
319325
Tooltip.install(imageView, tip);
320326
}
321327

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"username":"Seyyed","password":"Seyyed1","nickname":"Hosseini","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 27, 2022, 8:53:42 PM"},{"username":"smhh22","password":"Seyyed1","nickname":"Seyyed","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 19, 2022, 6:45:25 AM"},{"username":"ahn","password":"Amirh1","nickname":"ahn","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 16, 2022, 8:41:55 PM"},{"username":"ali","password":"Alireza1","nickname":"ali","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 16, 2022, 7:25:19 PM"}]
1+
[{"username":"Seyyed","password":"Seyyed1","nickname":"Hosseini","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 27, 2022, 9:20:06 PM"},{"username":"smhh22","password":"Seyyed1","nickname":"Seyyed","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 19, 2022, 6:45:25 AM"},{"username":"ahn","password":"Amirh1","nickname":"ahn","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 16, 2022, 8:41:55 PM"},{"username":"ali","password":"Alireza1","nickname":"ali","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 16, 2022, 7:25:19 PM"}]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"username":"Seyyed","password":"Seyyed1","nickname":"Hosseini","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 27, 2022, 8:52:18 PM"},{"username":"smhh22","password":"Seyyed1","nickname":"Seyyed","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 19, 2022, 6:45:25 AM"},{"username":"ahn","password":"Amirh1","nickname":"ahn","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 16, 2022, 8:41:55 PM"},{"username":"ali","password":"Alireza1","nickname":"ali","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 16, 2022, 7:25:19 PM"}]
1+
[{"username":"Seyyed","password":"Seyyed1","nickname":"Hosseini","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 27, 2022, 9:17:59 PM"},{"username":"smhh22","password":"Seyyed1","nickname":"Seyyed","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 19, 2022, 6:45:25 AM"},{"username":"ahn","password":"Amirh1","nickname":"ahn","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 16, 2022, 8:41:55 PM"},{"username":"ali","password":"Alireza1","nickname":"ali","score":0,"scoreTime":"Jan 1, 1970, 3:30:00 AM","lastSeen":"Jul 16, 2022, 7:25:19 PM"}]
72 Bytes
Binary file not shown.
72 Bytes
Binary file not shown.
58 Bytes
Binary file not shown.
576 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)