Merge branch 'master' of https://gitlab.crans.org/genie_logiciel_2015/the_dungeon_project

hooks/action_post_update

 #/bin/sh
 
 
-git config --bool hooks.allownonascii "false"
 exit 0

src/artificial_intelligence/AIEntities/StraightEntity.java

@@ -44,18 +44,15 @@ public class StraightEntity extends AbstractEntity {
                 this.random_move();
             }
         }
+        else{
+            Direction d = this.relayer.getCharacter().getDirection();
+            double r = random();
+            if(r<0.75){
+                this.relayer.move(d);
+            }
+            else{this.random_move();}
 
-
-
-        // A*
-        /*List<Entity> entityList=gameState.getAllEntities();
-        int dX = entityList.get(this.Choose_victim()).getX();
-        int dY = entityList.get(this.Choose_victim()).getY();
-        int sX = relayer.getCharacter().getX();
-        int sY = relayer.getCharacter().getY();
-        Direction dir = AI.alpha_star(sX, sY, dX, dY,map.getWidth(),map.getHeight());
-        //Logging.getInstance().getLogger().info(dir.toString());
-        this.relayer.move(dir);*/
+        }
 
         // attack
         this.relayer.tryToCastAbility(0);

src/core/gamestate/GameContent.java

@@ -41,7 +41,7 @@ public class GameContent implements Serializable{
 			for(Entity e:map.getEntities()){
 				gameState.addEntity(e);
 				 Relayer dmr = Relayers.addNewRelayer(e);
-				 AIControler.add(this,dmr, EnumBehaviourType.Basic);
+				 AIControler.add(this,dmr, EnumBehaviourType.Straight);
 			}
 		}
 		int posX=(map.getPositionPlayerStart().getI())*Point.TileScale;