mirror of
https://github.com/Klagarge/PokeHES.git
synced 2025-07-17 21:31:10 +00:00
all merge done without error
This commit is contained in:
@ -22,7 +22,7 @@ public class FightData {
|
||||
*/
|
||||
|
||||
public FightData(String name) {
|
||||
file = new File("resources//fight//" + name + ".csv");
|
||||
file = new File("./resources/Battle/Fight/" + name + ".csv");
|
||||
}
|
||||
|
||||
public void readFile() {
|
||||
|
@ -12,7 +12,7 @@ public class SpeechData {
|
||||
|
||||
|
||||
public SpeechData(String name){
|
||||
file = new File("resources//fight//" + name + ".csv");
|
||||
file = new File("./resources/Battle/Fight/" + name + ".csv");
|
||||
}
|
||||
|
||||
public void readFile() {
|
||||
@ -24,16 +24,16 @@ public class SpeechData {
|
||||
line = bf.readLine();
|
||||
while(line != null){
|
||||
|
||||
Speechs.add(line);
|
||||
speechs.add(line);
|
||||
|
||||
line = bf.readLine();
|
||||
}
|
||||
|
||||
bf.close();
|
||||
|
||||
} catch (Exception e) {
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
public String getSpeechs(int i) {
|
||||
|
Reference in New Issue
Block a user