diff --git a/src/Game/Battle.java b/src/Game/Battle.java index cdad210..8dbfc6b 100644 --- a/src/Game/Battle.java +++ b/src/Game/Battle.java @@ -8,16 +8,19 @@ public class Battle { private Enemy enemy; TextEnemy textEnemy; - public int lineSpeech = 0; + private int lineSpeech; - public int answer = 0; - private boolean c; + public int answer; + public Battle(Enemy enemy){ this.enemy = enemy; textEnemy = new TextEnemy("enemi"); // should be enemy.name textEnemy.generateText(); + lineSpeech = 0; + answer = 0; + //initialize the first line System.out.println("lll : "+ getLine()); @@ -26,6 +29,7 @@ public class Battle { public void readNextLine(){ //change line lineSpeech++; + } public boolean getAttackOn(){ @@ -35,6 +39,10 @@ public class Battle { public String getLine(){ return textEnemy.lines.get(lineSpeech).line; } + + public int getLineSpeech() { + return lineSpeech; + } } diff --git a/src/Screen/ScreenBattle.java b/src/Screen/ScreenBattle.java index 6d489b1..9d8e94f 100644 --- a/src/Screen/ScreenBattle.java +++ b/src/Screen/ScreenBattle.java @@ -52,7 +52,7 @@ public class ScreenBattle extends RenderingScreen{ displayDialog(g); - System.out.println(battle.lineSpeech); + System.out.println("render: " + battle.getLineSpeech()); } @Override @@ -97,7 +97,7 @@ public class ScreenBattle extends RenderingScreen{ public void manage(Controller c){ if(PokeMudry.front_montant){ - System.out.println(battle.lineSpeech); + System.out.println("manage: " + battle.getLineSpeech()); if( battle.getAttackOn() == false){ diff --git a/src/Text/TextEnemy.java b/src/Text/TextEnemy.java index 1d6e313..53b0d52 100644 --- a/src/Text/TextEnemy.java +++ b/src/Text/TextEnemy.java @@ -35,26 +35,42 @@ public class TextEnemy { } - int[] randomGenerate(int max_val){ - int min_val = 0; + int[] randomGenerate(int max_val){ + int max = 8-1; + Random r = new Random(); + + int nbre = 4; + + int[] t = new int[nbre]; int x; - int[] t = new int[max_val-1]; - Random ran = new Random(); - int i=0; + boolean same = false; + // initialize array at -1 + for(int j=0; j keyStatus = new TreeMap(); - double zoom; - Controller controller = new Controller(); - + +class testYann{ public static void main(String[] args) { - new testYann(); + int max = 8-1; + Random r = new Random(); + + int nbre = 4; + + int[] a = new int[nbre]; + int x; + int i=0; + boolean same = false; + + for(int j=0; j