digas99
diff --git a/‎logs/logging‎
Lines changed: 0 additions & 414 deletions b/‎logs/logging‎
Lines changed: 0 additions & 414 deletions
diff --git a/‎src/entities/MasterThief.java‎
Lines changed: 22 additions & 9 deletions b/‎src/entities/MasterThief.java‎
Lines changed: 22 additions & 9 deletions
diff --git a/‎src/entities/OrdinaryThief.java‎
Lines changed: 10 additions & 35 deletions b/‎src/entities/OrdinaryThief.java‎
Lines changed: 10 additions & 35 deletions
@@ -7,20 +7,33 @@
 import static utils.Utils.logger;
 
 public class MasterThief extends Thief {
-    boolean sentAnyAssaultParty;
 
-    public boolean sentAnyAssaultParty() {
-        return sentAnyAssaultParty;
-    }
-
-    public void sentAnyAssaultParty(boolean sentAnyAssaultParty) {
-        this.sentAnyAssaultParty = sentAnyAssaultParty;
-    }
+    private int activeAssaultParties;
+    private boolean[] hasCanvas;
 
     public MasterThief(String threadName, int thiefID, Museum museum, ConcentrationSite concentrationSite, CollectionSite collectionSite, AssaultParty[] assaultParties) throws MemException {
         super(threadName, thiefID, museum, concentrationSite, collectionSite, assaultParties);
         setThiefState(MasterThiefStates.PLANNING_HEIST);
-        sentAnyAssaultParty = false;
+        activeAssaultParties = 0;
+        hasCanvas = new boolean[N_ASSAULT_PARTIES];
+        for (int i = 0; i < N_ASSAULT_PARTIES; i++)
+            hasCanvas[i] = true;
+    }
+
+    public int getActiveAssaultParties() {
+        return activeAssaultParties;
+    }
+
+    public void setActiveAssaultParties(int activeAssaultParties) {
+        this.activeAssaultParties = activeAssaultParties;
+    }
+
+    public boolean hasCanvas(int partyID) {
+        return hasCanvas[partyID];
+    }
+
+    public void hasCanvas(int partyID, boolean hasCanvas) {
+        this.hasCanvas[partyID] = hasCanvas;
     }
 
     @Override
 
@@ -11,49 +11,24 @@
 
 public class OrdinaryThief extends Thief {
     private AssaultParty party;
-    private boolean canIMove;
-    private int position;
     private int displacement;
-    private int movesLeft;
     private boolean hasCanvas;
-    public void joinParty(int partyID) {
-        this.party = assaultParties[partyID];
-    }
-
-    public AssaultParty getParty() {
-        return party;
-    }
+    private Museum.Room[] rooms;
 
-    public boolean canMove() {
-        return canIMove;
+    public void setAssaultParty(int partyID) {
+        party = assaultParties[partyID];
     }
 
-    public void canMove(boolean canIMove) {
-        this.canIMove = canIMove;
-    }
-
-    public int getPosition() {
-        return position;
-    }
-
-    public void setPosition(int position) {
-        this.position = position;
+    public void setRoomOfParty(int roomID) {
+        party.setRoom(rooms[roomID]);
     }
 
     public int getDisplacement() {
         return displacement;
     }
 
-    public int getMovesLeft() {
-        return movesLeft;
-    }
-
-    public void setMovesLeft(int movesLeft) {
-        this.movesLeft = movesLeft;
-    }
-
-    public void resetMovesLeft() {
-        movesLeft = max(displacement, MAX_SEPARATION_LIMIT);
+    public void setDisplacement(int displacement) {
+        this.displacement = displacement;
     }
 
     public boolean hasCanvas() {
@@ -68,16 +43,16 @@ public OrdinaryThief(String threadName, int thiefID, Museum museum, Concentratio
         super(threadName, thiefID, museum, concentrationSite, collectionSite, assaultParties);
         thiefState = OrdinaryThiefStates.CONCENTRATION_SITE;
         displacement = random(MIN_DISPLACEMENT, MAX_DISPLACEMENT);
-        resetMovesLeft();
-        canIMove = hasCanvas = false;
+        hasCanvas = false;
+        rooms = museum.getRooms();
     }
 
     @Override
     public void run() {
         while (concentrationSite.amINeeded()) {
             concentrationSite.prepareExcursion();
             party.crawlIn();
-            museum.rollACanvas(party.getId());
+            museum.rollACanvas(party.getID());
             party.reverseDirection();
             party.crawlOut();
             collectionSite.handACanvas();