Changeset 6812 for code/branches/dynamicmatch/src/orxonox/controllers

Timestamp:

Apr 30, 2010, 4:42:58 PM (15 years ago)

Author:

jo

Message:

adding 3rd party: killers, making the gametype playable for larger groups of players, bug removed

File:

• code/branches/dynamicmatch/src/orxonox/controllers/ArtificialController.cc (modified) (2 diffs)

code/branches/dynamicmatch/src/orxonox/controllers/ArtificialController.cc

@@ -249 +249 @@
         if (dynamic)
         {
+            if (dynamic->notEnoughPigs||dynamic->notEnoughKillers||dynamic->notEnoughChasers) {return false;}
+        
             if (entity1->getPlayer())
                 team1 = dynamic->getParty(entity1->getPlayer());
@@ -254 +256 @@
             if (entity2->getPlayer())
                 team2 = dynamic->getParty(entity2->getPlayer());
-        }
-
-        return (team1 == team2 && team1 != -1)&&(!dynamic->onlyChasers); //returns false if players are in the same party and there is a victim
-    }                                                           //-> if there is no victim or the AI-Player is not in the same team the AI attacks
+                if (team1 ==-1 ||team2 ==-1 ) {return false;}
+                else if (team1 == dynamic->chaser && team2 != dynamic->chaser) {return false;}
+                else if (team1 == dynamic->piggy && team2 == dynamic->chaser) {return false;}
+                else if (team1 == dynamic->killer && team2 == dynamic->chaser) {return false;}
+                else return true;
+                
+        }
+
+        return (team1 == team2 && team1 != -1);
+    }
 }