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

src/artificial_intelligence/AIEntities/AbstractEntity.java

@@ -261,6 +261,17 @@ public abstract class AbstractEntity extends Thread {
         }
     }
 
+    public void waiting_move(){
+        Direction dir = this.relayer.getCharacter().getDirection();
+        double r = random();
+        if(r<0.8){
+            for(int i=0; i<1;i++) {
+                this.relayer.move(dir);
+            }
+        }
+        else{this.random_move();}
+    }
+
     public void act() {
     }
 

src/artificial_intelligence/AIEntities/BossEntity.java

@@ -39,7 +39,7 @@ public class BossEntity extends AbstractEntity {
             Entity victim = this.gameState.getAllEntities().get(victim_i);
             /* d_min  minimum distance to not run away
             * dmax maximum distance to not get closer*/
-            double d_min = 32*3; // tiles of length 32 : so 3 and 7 tiles
+            double d_min = 32*5; // tiles of length 32 : so 5 and 14 tiles
             double d_max = 32*14;
             double d = Distance_to_victim(victim);
             if(d<d_min){
@@ -56,14 +56,7 @@ public class BossEntity extends AbstractEntity {
         }
         else{
 
-            Direction dir = this.relayer.getCharacter().getDirection();
-            double r = random();
-            if(r<0.8){
-                for(int i=0; i<1;i++) {
-                    this.relayer.move(Direction.NONE);
-                }
-            }
-            else{this.random_move();}
+            this.waiting_move();
 
         }
 

src/artificial_intelligence/AIEntities/StraightEntity.java

@@ -52,17 +52,8 @@ public class StraightEntity extends AbstractEntity {
             }
         }
         else{
-            Direction d = this.relayer.getCharacter().getDirection();
-            double r = random();
-            if(r<0.8){
-                for(int i=0; i<1;i++) {
-                    this.relayer.move(d);
-                }
+            this.waiting_move();
         }
-            else{this.random_move();}
-
-        }
-
         // attack
     }
 }

src/core/gamestate/GameContent.java

@@ -43,8 +43,14 @@ public class GameContent implements Serializable{
 			for(Entity e:map.getEntities()){
 				gameState.addEntity(e);
 				 Relayer dmr = Relayers.addNewRelayer(e);
+				String name = dmr.getCharacter().getSpeciesName();
+				if(name.equals("Ronflex")){
 					AIControler.add(this,dmr, EnumBehaviourType.Boss);
 				}
+				else{
+					AIControler.add(this,dmr, EnumBehaviourType.Straight);
+				}
+			}
 		}
 		int posX=(map.getPositionPlayerStart().getI())*Point.TileScale;
 		int posY=(map.getPositionPlayerStart().getJ())*Point.TileScale;