Skip to content

Fix compile errors #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Panda248 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix compile errors #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 35 additions & 15 deletions src/entities/units/player/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,21 +249,41 @@ public Arte<? extends Unit> cardSelect(Input input) {
this.health = 0;
return selected;
}
return switch (input) {
case Input i && i.isKeyPressed(Input.KEY_1) -> selection(0);
case Input i && i.isKeyPressed(Input.KEY_2) -> selection(1);
case Input i && i.isKeyPressed(Input.KEY_3) -> selection(2);
case Input i && i.isKeyPressed(Input.KEY_4) -> selection(3);
case Input i && i.isKeyPressed(Input.KEY_5) -> selection(4);
case Input i && i.isKeyPressed(Input.KEY_6) -> selection(5);
// case Input i && i.isMousePressed(0) && onCard(i, 0) -> selection(0);
// case Input i && i.isMousePressed(0) && onCard(i, 1) -> selection(1);
// case Input i && i.isMousePressed(0) && onCard(i, 2) -> selection(2);
// case Input i && i.isMousePressed(0) && onCard(i, 3) -> selection(3);
// case Input i && i.isMousePressed(0) && onCard(i, 4) -> selection(4);
// case Input i && i.isMousePressed(0) && onCard(i, 5) -> selection(5);
default -> selected;
};
int i = -1;
if(input.isKeyPressed(Input.KEY_1)) {
i = 0;
}
else if(input.isKeyPressed(Input.KEY_2)) {
i = 1;
}
else if(input.isKeyPressed(Input.KEY_3)) {
i = 2;
}
else if(input.isKeyPressed(Input.KEY_4)) {
i = 3;
}
else if(input.isKeyPressed(Input.KEY_5)) {
i = 4;
}
else if(input.isKeyPressed(Input.KEY_6)) {
i = 5;
}
return i >= 0 ? selection(i) : selected;
// return switch (input) {
// case input.isKeyPressed(Input.KEY_1) -> selection(0);
// case input.isKeyPressed(Input.KEY_2) -> selection(1);
// case input.isKeyPressed(Input.KEY_3) -> selection(2);
// case input.isKeyPressed(Input.KEY_4) -> selection(3);
// case input.isKeyPressed(Input.KEY_5) -> selection(4);
// case input.isKeyPressed(Input.KEY_6) -> selection(5);
//// case Input i && i.isMousePressed(0) && onCard(i, 0) -> selection(0);
//// case Input i && i.isMousePressed(0) && onCard(i, 1) -> selection(1);
//// case Input i && i.isMousePressed(0) && onCard(i, 2) -> selection(2);
//// case Input i && i.isMousePressed(0) && onCard(i, 3) -> selection(3);
//// case Input i && i.isMousePressed(0) && onCard(i, 4) -> selection(4);
//// case Input i && i.isMousePressed(0) && onCard(i, 5) -> selection(5);
// default -> selected;
// };
}

public boolean onCard(Input input, int i) {
Expand Down