Skip to content

Ready system overhaul #15

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
offabsolute wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ready system overhaul #15

Show file tree
Hide file tree
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
35 changes: 31 additions & 4 deletions src/GraphServer/GraphServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,28 @@ protected void sendModeMessage()
sendMessageAll(message);
}

private boolean isPlayerReady(int playerID)
{
ListIterator<ClientConnection> itr = clients.listIterator();

while(itr.hasNext())
{
ClientConnection tmpClient = itr.next();
List<Player> players = tmpClient.getPlayers();
ListIterator<Player> pitr = players.listIterator();

while(pitr.hasNext())
{
Player player = pitr.next();
if(player.getID() == playerID)
{
return player.getReady();
}
}
}
return false;
}

private boolean checkAllReady()
{
ListIterator<ClientConnection> itr = clients.listIterator();
Expand Down Expand Up @@ -1105,7 +1127,6 @@ public synchronized void handleMessage(String message, ClientConnection client)
client.addPlayer(player);
players.add(player);

setEveryoneNotReady();
sendAddPlayerMessage(player, client);
}
}break;
Expand All @@ -1115,10 +1136,12 @@ public synchronized void handleMessage(String message, ClientConnection client)
int team = Integer.parseInt(info[1]);
int playerID = Integer.parseInt(info[2]);

if(isPlayerReady(playerID))
break;

// Only send message to everyone if player belongs to that client
if(setTeam(team, playerID, client))
{
setEveryoneNotReady();
sendMessageAll(message);
}
}break;
Expand All @@ -1139,9 +1162,11 @@ public synchronized void handleMessage(String message, ClientConnection client)
{
int playerID = Integer.parseInt(info[1]);

if(isPlayerReady(playerID))
break;

if(addSoldier(playerID, client))
{
setEveryoneNotReady();
sendMessageAll(message);
}
}break;
Expand All @@ -1150,9 +1175,11 @@ public synchronized void handleMessage(String message, ClientConnection client)
{
int playerID = Integer.parseInt(info[1]);

if(isPlayerReady(playerID))
break;

if(removeSoldier(playerID, client))
{
setEveryoneNotReady();
sendMessageAll(message);
}
}break;
Expand Down
1 change: 1 addition & 0 deletions src/Graphwar/GameData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,7 @@ private void setReadyMessage(String[] info) throws Exception

if(gameState == Constants.PRE_GAME)
{
((PreGameScreen)graphwar.getUI().getScreen(Constants.PRE_GAME_SCREEN)).updatePlayer(player);
((PreGameScreen)graphwar.getUI().getScreen(Constants.PRE_GAME_SCREEN)).repaint();
}

Expand Down
12 changes: 10 additions & 2 deletions src/Graphwar/PlayerBoard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ public void actionPerformed(ActionEvent arg0)
{
if(arg0.getSource() == switchSide)
{
if(player.getReady())
return;
graphwar.getGameData().switchSide(player);
}
else if(arg0.getSource() == removePlayer)
Expand All @@ -183,6 +185,8 @@ else if(arg0.getSource() == removePlayer)
}
else if(isAddSoldier(arg0.getSource()))
{
if(player.getReady())
return;
graphwar.getGameData().addSoldier(player);
}
}
Expand All @@ -193,6 +197,8 @@ public void mouseClicked(MouseEvent arg0)
{
if(isAddSoldier(arg0.getSource()))
{
if(player.getReady())
return;
graphwar.getGameData().removeSoldier(player);
}
}
Expand Down Expand Up @@ -271,9 +277,11 @@ private void updatePlayerButtons(Player player)
{
if(playersEntries[i].player == player)
{
boolean canInteract = (player.isLocalPlayer() || graphwar.getGameData().isLeader()) && !player.getReady();

if(player.getTeam() == Constants.TEAM1)
{
if(player.isLocalPlayer() || graphwar.getGameData().isLeader())
if(canInteract)
{
playersEntries[i].switchSide.updateImages(switchNormal, switchOver, switchMask);
playersEntries[i].removePlayer.updateImages(removeNormal, removeOver, removeMask);
Expand All @@ -298,7 +306,7 @@ private void updatePlayerButtons(Player player)
}
else
{
if(player.isLocalPlayer() || graphwar.getGameData().isLeader())
if(canInteract)
{
playersEntries[i].switchSide.updateImages(switchNormalMirror, switchOverMirror, switchMaskMirror);
playersEntries[i].removePlayer.updateImages(removeNormalMirror, removeOverMirror, removeMaskMirror);
Expand Down