1
0
mirror of https://github.com/Klagarge/PokeHES.git synced 2025-07-07 00:41:10 +00:00

Merge pull request #42 from Klagarge:equilibrage

Equilibrage
This commit is contained in:
Rémi Heredero
2022-06-16 19:14:11 +02:00
committed by GitHub
28 changed files with 71 additions and 67 deletions

View File

@ -46,12 +46,12 @@ public class PokeMudry extends PortableApplication {
// add player, create and add all enemies in entities
entities.add((Entity) sp.p);
enemies.add(new Enemy("Mudry", 5, 11, "lumberjack_sheet32", "21N304", 25, "informatique", Direction.DOWN));
enemies.add(new Enemy("Paciotti", 5, 11, "lumberjack_sheet32", "21N205", 0, "mecanique", Direction.DOWN));
enemies.add(new Enemy("Gloeckner", 1, 7, "lumberjack_sheet32", "21N307", 0, "allemand", Direction.RIGHT));
enemies.add(new Enemy("Bianchi", 1, 3, "lumberjack_sheet32", "23N308", 0, "electricite", Direction.RIGHT));
enemies.add(new Enemy("Nicollier", 4, 2, "lumberjack_sheet32", "21N308", 0, "mathematique", Direction.LEFT));
enemies.add(new Enemy("Ellert", 1, 4, "lumberjack_sheet32", "23N215", 0, "physique", Direction.RIGHT));
enemies.add(new Enemy("Gloeckner", 1, 7, "lumberjack_sheet32", "21N307", 600, "allemand", Direction.RIGHT));
enemies.add(new Enemy("Nicollier", 4, 2, "lumberjack_sheet32", "21N308", 1600, "mathematique", Direction.LEFT));
enemies.add(new Enemy("Mudry", 5, 11, "lumberjack_sheet32", "21N304", 700, "informatique", Direction.DOWN));
enemies.add(new Enemy("Ellert", 1, 4, "lumberjack_sheet32", "23N215", 300, "physique", Direction.RIGHT));
enemies.add(new Enemy("Bianchi", 1, 3, "lumberjack_sheet32", "23N308", 1200, "electricite", Direction.RIGHT));
enemies.add(new Enemy("Paciotti", 5, 11, "lumberjack_sheet32", "21N205", 1200, "mecanique", Direction.DOWN));
for (Enemy enemy : enemies) { entities.add(enemy); }
//Init all entities

View File

@ -3,6 +3,7 @@ package Text;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.nio.charset.StandardCharsets;
import java.util.Vector;
public class FightData {
@ -25,7 +26,7 @@ public class FightData {
String line = "";
try {
FileReader f = new FileReader(file);
FileReader f = new FileReader(file, StandardCharsets.UTF_8);
BufferedReader bf = new BufferedReader(f);
//add the line in the vector attacks of attack

View File

@ -4,6 +4,7 @@ import java.util.Vector;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.nio.charset.StandardCharsets;
public class SpeechData {
@ -18,7 +19,7 @@ public class SpeechData {
public void readFile() {
String line = "";
try {
FileReader f = new FileReader(file);
FileReader f = new FileReader(file, StandardCharsets.UTF_8);
BufferedReader bf = new BufferedReader(f);
line = bf.readLine();

View File

@ -5,6 +5,7 @@ import java.util.Vector;
import Entity.Enemy;
import Entity.Character.Direction;
import java.text.Normalizer;
import java.util.Arrays;
import java.util.Random;