Klagarge/PokeHES
1
0
Fork 0
mirror of https://github.com/Klagarge/PokeHES.git synced 2025-10-31 03:39:16 +00:00
Code Releases Activity

fix error of merge

Browse Source
This commit is contained in:
Rémi Heredero
2022-06-17 09:05:22 +02:00
parent b67798adb5
commit 769adeeeca
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Text/FightData.java
View File

@@ -12,7 +12,7 @@ public class FightData {
private File file; private File file;
private static String regex = ";"; private static String regex = ";";
public int nbre_line =0; public int nbr_line =0;
public FightData(String branch) { public FightData(String branch) {
file = new File("./Data/Battle/Fight/" + branch + ".csv"); file = new File("./Data/Battle/Fight/" + branch + ".csv");
@@ -46,7 +46,7 @@ public class FightData {
} }
//return the vector with all attaks of one enemi //return the vector with all attacks of one enemy
public Vector<Attack> getAllAttacks(){ public Vector<Attack> getAllAttacks(){
return attacks; return attacks;
} }

3
src/Text/TextEnemy.java
View File

@@ -2,7 +2,6 @@ package Text;
import Entity.Enemy; import Entity.Enemy;
import java.util.Vector; import java.util.Vector;
import java.util.Arrays;
import java.util.Random; import java.util.Random;
public class TextEnemy { public class TextEnemy {
@@ -79,7 +78,7 @@ public class TextEnemy {
int[] currentRandom = new int[5]; int[] currentRandom = new int[5];
currentRandom[0] = orderAttack[j]; currentRandom[0] = orderAttack[j];
//generate a random array to determin the order of the answer //generate a random array to determine the order of the answer
orderAnswer = randomGenerate(0, 3, 4); orderAnswer = randomGenerate(0, 3, 4);
//save the order of answer and attack //save the order of answer and attack