wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Notifications are scrollable, workers do automated action when button is clicked

Browse source
This commit is contained in:
Yair Morgenstern 2017-12-26 21:59:25 +02:00
parent 39ea64b870
commit e9ad0be635
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/com/unciv/civinfo/MapUnit.java
View file

@ -45,7 +45,7 @@ public class MapUnit{
}
}
private void doAutomatedAction(TileInfo tile){
public void doAutomatedAction(TileInfo tile){
if(tile.owner!=null && tile.improvement==null // We'll be working this tile
&& (tile.workingCity!=null || tile.resource!=null || tile.improvementInProgress!=null)
&& tile.canBuildImprovement(GameBasics.TileImprovements.get(chooseImprovement(tile))))

2
core/src/com/unciv/game/CityScreen.java
View file

@ -96,7 +96,7 @@ public class CityScreen extends CameraStageBaseScreen {
private Image getSpecialistIcon(String imageName, final boolean isFilled, final FullStats specialistType) {
Image specialist = ImageGetter.getImage(imageName);
specialist.setSize(30,30);
specialist.setSize(40,40);
if(!isFilled) specialist.setColor(Color.GRAY);
specialist.addListener(new ClickListener(){
@Override

10
core/src/com/unciv/game/WorldScreen.java
View file

@ -71,7 +71,10 @@ public class WorldScreen extends CameraStageBaseScreen {
stage.addActor(civTable);
stage.addActor(techButton);
stage.addActor(notificationsTable);
ScrollPane notificationsScroll = new ScrollPane(notificationsTable);
notificationsScroll.setSize(stage.getWidth()/3, stage.getHeight()/3);
stage.addActor(notificationsScroll);
addSelectIdleUnitButton();
update();
@ -473,7 +476,10 @@ public class WorldScreen extends CameraStageBaseScreen {
public void clicked(InputEvent event, float x, float y) {
if ("automation".equals(selectedTile.unit.action))
selectedTile.unit.action = null;
else selectedTile.unit.action = "automation";
else {
selectedTile.unit.action = "automation";
selectedTile.unit.doAutomatedAction(selectedTile);
}
update();
}
});