Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed: PickOptionalTribeCard and PickOptionalBuildingCard in Game and GameController

Browse Source
This commit is contained in:
rubenpirreram
2026-05-17 16:32:42 +02:00
parent d9ef7983f8
commit 4b4614d17e
8 changed files with 90 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/NoOptionalCard.java
+1 -2
View File
@@ -4,7 +4,6 @@ import it.polimi.ingsw.gc14.Controller.GameController;
import it.polimi.ingsw.gc14.Model.MiniModel;
import it.polimi.ingsw.gc14.Network.EventType;
import it.polimi.ingsw.gc14.Network.NetworkEvent;
import it.polimi.ingsw.gc14.View.IView;
import java.io.Serializable;
@@ -28,7 +27,7 @@ public class NoOptionalCard extends NetworkEvent implements Serializable{
*/
@Override
public boolean apply(GameController gameController){
return gameController.noOptionalCard(username);
return gameController.SkipTurn(username);
}
//TODO
@Override
src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/PickOptionalBuildingCard.java
+1 -2
View File
@@ -4,7 +4,6 @@ import it.polimi.ingsw.gc14.Controller.GameController;
import it.polimi.ingsw.gc14.Model.MiniModel;
import it.polimi.ingsw.gc14.Network.EventType;
import it.polimi.ingsw.gc14.Network.NetworkEvent;
import it.polimi.ingsw.gc14.View.IView;
import java.io.Serializable;
@@ -33,7 +32,7 @@ public class PickOptionalBuildingCard extends NetworkEvent implements Serializa
*/
@Override
public boolean apply(GameController gameController){
return gameController.pickOptionalBuildingCard(username, pos);
return gameController.drawUpperBuildingCard(username, pos);
}
//TODO
@Override
src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/PickOptionalTribeCard.java
+1 -2
View File
@@ -4,7 +4,6 @@ import it.polimi.ingsw.gc14.Controller.GameController;
import it.polimi.ingsw.gc14.Model.MiniModel;
import it.polimi.ingsw.gc14.Network.EventType;
import it.polimi.ingsw.gc14.Network.NetworkEvent;
import it.polimi.ingsw.gc14.View.IView;
import java.io.Serializable;
@@ -33,7 +32,7 @@ public class PickOptionalTribeCard extends NetworkEvent implements Serializable
*/
@Override
public boolean apply(GameController gameController){
return gameController.pickOptionalTribeCard(username, pos);
return gameController.drawUpperTribeCard(username, pos);
}
//TODO
src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/SkipNoDrawable.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class SkipNoDrawable extends NetworkEvent implements Serializable{
*/
@Override
public boolean apply(GameController gameController){
return gameController.SkipNoDrawable(username);
return gameController.SkipTurn(username);
}
//TODO