1
0
mirror of https://github.com/Klagarge/PokeHES.git synced 2025-10-30 11:19:17 +00:00

fix error of merge

This commit is contained in:
2022-06-17 09:05:22 +02:00
parent b67798adb5
commit 769adeeeca
2 changed files with 3 additions and 4 deletions

View File

@@ -12,7 +12,7 @@ public class FightData {
private File file;
private static String regex = ";";
public int nbre_line =0;
public int nbr_line =0;
public FightData(String branch) {
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(){
return attacks;
}