Changeset 11 for protocol/src/main/java/geniusweb/protocol/session/shaop/SHAOPState.java

Timestamp:

01/30/20 16:52:38 (4 years ago)

Author:

bart

Message:

Tournament overview table, few bug fixes

File:

• protocol/src/main/java/geniusweb/protocol/session/shaop/SHAOPState.java (modified) (10 diffs)

protocol/src/main/java/geniusweb/protocol/session/shaop/SHAOPState.java

@@ -41 +41 @@
                         @JsonProperty("settings") SHAOPSettings settings,
                         @JsonProperty("error") ProtocolException e,
-                        @JsonProperty("actorNr") int actorNr,
+                        @JsonProperty("teamNr") int teamNr,
                         @JsonProperty("partyNumbers") Map<PartyId, Integer> partytNumbers,
                         @JsonProperty("totalSpent") Map<PartyId, Double> spent) {
-                super(actions, conns, progress, settings, e, actorNr, partytNumbers,
+                super(actions, conns, progress, settings, e, teamNr, partytNumbers,
                                 spent);
         }
@@ -73 +73 @@
          */
         public boolean isShaopParty(PartyId party) {
-                return settings.isShaopParty(partyNumbers.get(party));
+                return (partyNumbers.get(party) & 1) == 0;
         }
 
@@ -79 +79 @@
          * 
          * @param party a Party Id
-         * @return the PartyId of the party
+         * @return the PartyId of the party (COB and SHAOP are partners)
          */
         public PartyId getPartner(PartyId party) {
@@ -132 +132 @@
                 newNumbers.put(connection.getParty(), connections.size());
                 return new SHAOPState(actions, newconns, progress, settings, null,
-                                actorNr, newNumbers, totalSpent);
+                                teamNr, newNumbers, totalSpent);
         }
 
@@ -144 +144 @@
         public SHAOPState with(ProtocolException e) {
                 return new SHAOPState(actions, connections, progress, settings, e,
-                                actorNr, partyNumbers, totalSpent);
+                                teamNr, partyNumbers, totalSpent);
         }
 
@@ -162 +162 @@
                 }
                 return new SHAOPState(actions, connections, newprogress, settings,
-                                error, actorNr, partyNumbers, totalSpent);
+                                error, teamNr, partyNumbers, totalSpent);
         }
 
@@ -259 +259 @@
                 List<Action> newactions = new LinkedList<>(getActions());
                 newactions.add(action);
-                int newActor = actorNr;
+                int newTeam = teamNr;
                 if (action instanceof ElicitComparison) {
                         Object cost = getPartyProfile(partyid).getParty().getParameters()
@@ -276 +276 @@
                 } else {
                         // shaop party does real action, move to next SHAOP party.
-                        newActor = (actorNr + 2) % settings.getTeams().size();
+                        newTeam = (teamNr + 1) % settings.getTeams().size();
                         if (newprogress instanceof ProgressRounds) {
                                 newprogress = ((ProgressRounds) newprogress).advance();
@@ -282 +282 @@
                 }
                 return new SHAOPState(newactions, connections, newprogress, settings,
-                                null, newActor, partyNumbers, newSpent);
+                                null, newTeam, partyNumbers, newSpent);
 
         }
@@ -298 +298 @@
                 if (!isShaopParty(actor))
                         throw new IllegalArgumentException(
-                                        "Illegal action for COB party" + action);
+                                        "Only SHAOP party can execute " + action);
                 // real action only allowed if party has the turn.
-                if (!actor.equals(connections.get(actorNr).getParty())) {
+                if (!actor.equals(connections.get(2 * teamNr).getParty())) {
                         throw new IllegalArgumentException("Party does not have the turn ");
                 }