From c94e170a305f71cf8513be6f92e162a3eda22ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Heredero?= Date: Sun, 19 Jun 2022 23:29:02 +0200 Subject: [PATCH] add version --- src/Entity/Enemy.java | 5 +++++ src/Entity/Player.java | 5 +++++ src/Entity/Stuff.java | 5 +++++ src/Game/Battle.java | 5 +++++ src/Main/PokeHES.java | 6 +++++- src/Main/Settings.java | 5 +++++ src/Screen/ManagerOfScreen.java | 5 +++++ src/Screen/ScreenBattle.java | 5 +++++ src/Screen/ScreenEnd.java | 13 +++++++++---- src/Screen/ScreenMap.java | 5 +++++ src/Screen/ScreenPlayer.java | 5 +++++ src/Text/Attack.java | 5 +++++ src/Text/FightData.java | 5 +++++ src/Text/Line.java | 5 +++++ src/Text/SpeechData.java | 5 +++++ src/Text/TextEnemy.java | 10 +++++++--- 16 files changed, 86 insertions(+), 8 deletions(-) diff --git a/src/Entity/Enemy.java b/src/Entity/Enemy.java index 9ad00ae..f6756d3 100644 --- a/src/Entity/Enemy.java +++ b/src/Entity/Enemy.java @@ -4,6 +4,11 @@ import com.badlogic.gdx.math.Vector2; import Main.Settings; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class Enemy extends Character{ private String subject; diff --git a/src/Entity/Player.java b/src/Entity/Player.java index 9cce05b..15a4ec3 100644 --- a/src/Entity/Player.java +++ b/src/Entity/Player.java @@ -11,6 +11,11 @@ import Main.PokeHES; import Main.Settings; import Screen.ScreenMap; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class Player extends Character{ private int xp = 0; diff --git a/src/Entity/Stuff.java b/src/Entity/Stuff.java index 6562e43..1d4f60b 100644 --- a/src/Entity/Stuff.java +++ b/src/Entity/Stuff.java @@ -2,6 +2,11 @@ package Entity; import ch.hevs.gdx2d.lib.GdxGraphics; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class Stuff extends Entity{ public Stuff(String name, int x, int y, String map) { diff --git a/src/Game/Battle.java b/src/Game/Battle.java index 736df43..913731c 100644 --- a/src/Game/Battle.java +++ b/src/Game/Battle.java @@ -4,6 +4,11 @@ import Entity.Enemy; import Entity.Player; import Text.TextEnemy; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.2 + */ public class Battle { public Enemy e; diff --git a/src/Main/PokeHES.java b/src/Main/PokeHES.java index 3e583e5..e79904e 100644 --- a/src/Main/PokeHES.java +++ b/src/Main/PokeHES.java @@ -15,6 +15,11 @@ import Screen.ScreenPlayer; import ch.hevs.gdx2d.desktop.PortableApplication; import ch.hevs.gdx2d.lib.GdxGraphics; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.2 + */ public class PokeHES extends PortableApplication { private ScreenPlayer sp; @@ -48,7 +53,6 @@ public class PokeHES extends PortableApplication { sp.init(); controller.init(); - enemies.add(new Enemy("Mudry", 5, 6, "21RI", 700, "informatique")); // add player, create and add all enemies in entities entities.add((Entity) sp.p); enemies.add(new Enemy("gloeckner", 1, 7, "21N307", 600, "allemand")); diff --git a/src/Main/Settings.java b/src/Main/Settings.java index 75e5b30..c263d00 100644 --- a/src/Main/Settings.java +++ b/src/Main/Settings.java @@ -1,5 +1,10 @@ package Main; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class Settings { public static final boolean ANDROID = false; diff --git a/src/Screen/ManagerOfScreen.java b/src/Screen/ManagerOfScreen.java index dc4b3b5..614c8af 100644 --- a/src/Screen/ManagerOfScreen.java +++ b/src/Screen/ManagerOfScreen.java @@ -2,6 +2,11 @@ package Screen; import ch.hevs.gdx2d.lib.ScreenManager; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class ManagerOfScreen extends ScreenManager{ ManagerOfScreen(){ } diff --git a/src/Screen/ScreenBattle.java b/src/Screen/ScreenBattle.java index 9e1cf80..5f193cd 100644 --- a/src/Screen/ScreenBattle.java +++ b/src/Screen/ScreenBattle.java @@ -17,6 +17,11 @@ import ch.hevs.gdx2d.components.bitmaps.BitmapImage; import ch.hevs.gdx2d.components.screen_management.RenderingScreen; import ch.hevs.gdx2d.lib.GdxGraphics; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.2 + */ public class ScreenBattle extends RenderingScreen{ private static int EDGE = 10; diff --git a/src/Screen/ScreenEnd.java b/src/Screen/ScreenEnd.java index 761321e..0b3c13f 100644 --- a/src/Screen/ScreenEnd.java +++ b/src/Screen/ScreenEnd.java @@ -12,15 +12,20 @@ import Main.Settings; import ch.hevs.gdx2d.components.screen_management.RenderingScreen; import ch.hevs.gdx2d.lib.GdxGraphics; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class ScreenEnd extends RenderingScreen{ private String textEnd = null; - private BitmapFont unbuntuRegularWhite; + private BitmapFont ubuntuRegularWhite; @Override public void onInit() { //generate a new font - unbuntuRegularWhite = generateFont("font/Ubuntu-Regular.ttf", 30, Color.WHITE); + ubuntuRegularWhite = generateFont("font/Ubuntu-Regular.ttf", 30, Color.WHITE); } @@ -30,13 +35,13 @@ public class ScreenEnd extends RenderingScreen{ g.clear(Color.BLACK); //display the text - if(textEnd != null) g.drawStringCentered(Settings.SIDE/2, textEnd, unbuntuRegularWhite); + if(textEnd != null) g.drawStringCentered(Settings.SIDE/2, textEnd, ubuntuRegularWhite); } @Override public void dispose() { - unbuntuRegularWhite.dispose(); + ubuntuRegularWhite.dispose(); } //set a different text if the player win or loose diff --git a/src/Screen/ScreenMap.java b/src/Screen/ScreenMap.java index 89a3033..ec27cad 100644 --- a/src/Screen/ScreenMap.java +++ b/src/Screen/ScreenMap.java @@ -21,6 +21,11 @@ import Entity.Player; import ch.hevs.gdx2d.components.screen_management.RenderingScreen; import ch.hevs.gdx2d.lib.GdxGraphics; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.1 + */ public class ScreenMap extends RenderingScreen{ // tiles management diff --git a/src/Screen/ScreenPlayer.java b/src/Screen/ScreenPlayer.java index b5c6a05..f419a0f 100644 --- a/src/Screen/ScreenPlayer.java +++ b/src/Screen/ScreenPlayer.java @@ -5,6 +5,11 @@ import Entity.Player; import Game.Battle; import ch.hevs.gdx2d.lib.GdxGraphics; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class ScreenPlayer { public ManagerOfScreen screenManager = new ManagerOfScreen(); public Player p = null; diff --git a/src/Text/Attack.java b/src/Text/Attack.java index 9835acf..30f02d2 100644 --- a/src/Text/Attack.java +++ b/src/Text/Attack.java @@ -1,5 +1,10 @@ package Text; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class Attack { String attack; int currentAttack; diff --git a/src/Text/FightData.java b/src/Text/FightData.java index ba7b3a7..aaa4147 100644 --- a/src/Text/FightData.java +++ b/src/Text/FightData.java @@ -6,6 +6,11 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.Vector; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class FightData { private Vector attacks = new Vector(); diff --git a/src/Text/Line.java b/src/Text/Line.java index 64df4ab..f6b2866 100644 --- a/src/Text/Line.java +++ b/src/Text/Line.java @@ -1,5 +1,10 @@ package Text; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class Line { public String line; public boolean attackOn; diff --git a/src/Text/SpeechData.java b/src/Text/SpeechData.java index ac20da6..b00267a 100644 --- a/src/Text/SpeechData.java +++ b/src/Text/SpeechData.java @@ -6,6 +6,11 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.Vector; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.0 + */ public class SpeechData { Vector speechs = new Vector(); diff --git a/src/Text/TextEnemy.java b/src/Text/TextEnemy.java index f6227b8..85361bc 100644 --- a/src/Text/TextEnemy.java +++ b/src/Text/TextEnemy.java @@ -5,6 +5,11 @@ import java.util.Vector; import java.util.Arrays; import java.util.Random; +/** + * @author Rémi Heredero + * @author Yann Sierro + * @version 1.0.2 + */ public class TextEnemy { private static final int CUT = 55; public FightData fightData; @@ -73,6 +78,7 @@ public class TextEnemy { //generate the text who is displays in battle screen public void generateText(int cursor){ lines.clear(); + currentData.clear(); int i =1; //introduction line @@ -111,13 +117,11 @@ public class TextEnemy { } //display answer - /* + System.out.println("----------"); for(int[] a : currentData){ System.out.println(Arrays.toString(a)); } - */ - //finish (win and death) String dead = formatLine(speechData.getSpeechs(5),CUT); String alive = formatLine(speechData.getSpeechs(6), CUT);