Merge pull request #48 from Klagarge/comments-HER

Comments her

Data/Battle/Fight/allemand.csv

@@ -1,5 +1,5 @@
 Traduisez < constituant > : ;verfassunggebend;belastend;zerstorant;Bestandteil;100
 Traduisez < Jugendanimationankundigung > : ;l'annonce d'animation des jeunes;la prestation de la jeunesse;l'annonce de la jeunesse;l'annonce d'animation jeunesse;100
 Accordez : < Er hat blau... Augen. >;Er hat blaue Augen.;Er hat blau Augen.;Er hat blauen Augen.;Er hat blauer Augen;100
-Conjuguez < absetzen > (Plusquamperfekt) 2p. Pl. : ;wir hatten abgesetzt;wir hatten abgesetzt;du hast abgesetzt;Du sitz;175
+Conjuguez < absetzen > (Plusquamperfekt) 2p. Pl. : ;ihr hatten abgesetzt;wir hatten abgesetzt;du hast abgesetzt;ihr sitz;175
 Conjuger: Er <umfahren> ein Kind. (Prasens);Er umfahrt ein Kind;Er fahrt ein Kind um;Er umfahre ein Kind;Er fahre ein Kind um;125

src/Game/Battle.java

@@ -18,7 +18,7 @@ public class Battle {
     public int xpPlayer;
 
     public boolean screenBattleOn = true;
-   
+
     public Battle(Enemy e){
         if(e != null){
             textEnemy = new TextEnemy(e);  

src/Main/PokeMudry.java

@@ -69,7 +69,7 @@ public class PokeMudry extends PortableApplication {
         boolean onEndScreen = sp.screenManager.getActiveScreen().getClass().equals(ScreenEnd.class);
 
         long timeNow = System.currentTimeMillis();
-        if((timeNow-lastMesure) >= 1000 && !onEndScreen){ // one second
+        if((timeNow-lastMesure) >= 1000 && !onEndScreen){ // one second during the game
             lastMesure = timeNow;
             sp.p.removedPv(1);
             for (Enemy enemy : enemies) { enemy.recoveredTime++; }

src/Screen/ManagerOfScreen.java

@@ -6,16 +6,28 @@ public class ManagerOfScreen extends ScreenManager{
     ManagerOfScreen(){
     }
 
+    /**
+     * Get the current screen map
+     * @return the current screen map
+     */
     public ScreenMap getScreenMap(){
         this.activateScreen(0);
         return (ScreenMap)this.getActiveScreen();
     }
 
+    /**
+     * Get the current screen battle
+     * @return the current screen battle
+     */
     public ScreenBattle getScreenBattle(){
         this.activateScreen(1);
         return (ScreenBattle)this.getActiveScreen();
     }
 
+    /**
+     * Get the current end screen
+     * @return the current end screen
+     */
     public ScreenEnd getScreenEnd(){
         this.activateScreen(2);
         return (ScreenEnd) this.getActiveScreen();

src/Screen/ScreenMap.java

@@ -47,7 +47,7 @@ public class ScreenMap extends RenderingScreen{
 
         try { map = player.getMap(); } catch (Exception e) {}
 
-		// create map
+		// create all map
 		createMap("test");
 		createMap("test_couloir");
 		createMap("desert");
@@ -150,6 +150,11 @@ public class ScreenMap extends RenderingScreen{
         return speed;
 	}
 
+    /**
+     * Check if the position is a door and if yes, get and save all settings for change map
+     * @param position The position to be tested
+     * @return true if it's a door
+     */
     public boolean isDoor(Vector2 position) {
 		if (doors == null) return false;
         boolean onDoor = false;

src/Screen/ScreenPlayer.java

@@ -17,10 +17,9 @@ public class ScreenPlayer {
     public void init(){
 
         // One player by ScreenPlayer
-        //p = new Player(8, 15, "desert");
         p = new Player(4, 2, "21RI");
 
-        e = new Enemy("enemy", 0, 0, "desert", 50, "enemy");
+        e = new Enemy("enemy", 0, 0, "21RI", 50, "enemy");
         b = new Battle(e);
 
         // Create both type of screen and record for reuse
@@ -31,7 +30,6 @@ public class ScreenPlayer {
         se = screenManager.getScreenEnd();
         sm = screenManager.getScreenMap();
         
-
     }
 
     public void render(GdxGraphics g){