Removed property changes
This commit is contained in:
@@ -6,6 +6,7 @@ import it.polimi.ingsw.gc14.Model.Cards.BuildingCard;
|
||||
import it.polimi.ingsw.gc14.Model.Cards.TribeCard;
|
||||
import it.polimi.ingsw.gc14.Model.GamePackage.Board;
|
||||
import it.polimi.ingsw.gc14.Model.GamePackage.CurrentState;
|
||||
import it.polimi.ingsw.gc14.Model.Orders.OrderPlayer;
|
||||
import javafx.animation.ScaleTransition;
|
||||
import javafx.application.Platform;
|
||||
import javafx.event.Event;
|
||||
@@ -70,25 +71,9 @@ public class MainFXMLController {
|
||||
|
||||
// Initialize popup
|
||||
initPopup();
|
||||
|
||||
|
||||
controller.miniModel.addPropertyChangeListener(evt -> {
|
||||
switch (evt.getPropertyName()) {
|
||||
case "board" -> ciao("board");
|
||||
case "currentState" -> ciao("currentState");
|
||||
case "players" -> Platform.runLater(() -> renderSidePanel());
|
||||
case "slotPlayerMap" -> Platform.runLater(() -> renderBoard());
|
||||
case "orderLogicCard"-> Platform.runLater(() -> renderBoard());
|
||||
case "availableTotems"-> ciao("availableTotems");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public void ciao(String s) {
|
||||
System.out.println(s);
|
||||
}
|
||||
|
||||
|
||||
public void render() {
|
||||
renderBackground();
|
||||
@@ -309,15 +294,11 @@ public class MainFXMLController {
|
||||
StackPane.setAlignment(overlay, Pos.TOP_LEFT);
|
||||
StackPane.setMargin(overlay, new Insets(9, 0, 0, 57));
|
||||
|
||||
List<Player> ordered = controller.miniModel.players.values().stream()
|
||||
.filter(p -> !controller.miniModel.orderLogicCard.players.contains(p))
|
||||
.collect(Collectors.toList());
|
||||
ordered.addAll(controller.miniModel.orderLogicCard.players);
|
||||
for (Player player : ordered) {
|
||||
ImageView totem = new ImageView(new Image(getClass().getResourceAsStream("/GUIImages/Totems/totem_" + player.totem.toString().toLowerCase(Locale.ROOT) + ".png")));
|
||||
for (OrderPlayer player : controller.miniModel.orderLogicCard.playerList) {
|
||||
ImageView totem = new ImageView(new Image(getClass().getResourceAsStream("/GUIImages/Totems/totem_" + player.player.totem.toString().toLowerCase(Locale.ROOT) + ".png")));
|
||||
totem.setFitHeight(70);
|
||||
totem.setPreserveRatio(true);
|
||||
if (!controller.miniModel.orderLogicCard.players.contains(player)) {
|
||||
if(controller.miniModel.slotPlayerMap.containsValue(player.player)) {
|
||||
totem.setOpacity(0.5);
|
||||
}
|
||||
overlay.getChildren().add(totem);
|
||||
|
||||
Reference in New Issue
Block a user