Kata refactoring

@@ -0,0 +1,33 @@

+plugins {

+    id 'application'

+    id 'java'

+    id "jacoco"

+    id 'info.solidsoft.pitest' version '1.15.0'

+}

+

+application {

+   mainClass = "re.forestier.edu.Main"

+}

+

+group = 're.forestier.edu'

+version = '1.0-SNAPSHOT'

+

+repositories {

+    mavenCentral()

+}

+

+dependencies {

+    testImplementation platform('org.junit:junit-bom:5.10.0')

+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'

+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'

+    testImplementation 'org.pitest:pitest-junit5-plugin:1.1.1'

+    testImplementation("com.approvaltests:approvaltests:15.6.0")

+    implementation 'org.hamcrest:hamcrest:2.2'

+    implementation("org.freemarker:freemarker:2.3.30")

+

+

+}

+

+test {

+    useJUnitPlatform()

+}

\ No newline at end of file

@@ -1,9 +1,13 @@

 plugins {

+id 'application'

     id 'java'

     id "jacoco"

     id 'info.solidsoft.pitest' version '1.15.0'

 }

+application{

+	mainClass = 're.forestier.edu.Main'

+}

 group = 're.forestier.edu'

 version = '1.0-SNAPSHOT'

@@ -41,7 +41,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.173s</div>

+<div class="counter">0.169s</div>

 <p>duration</p>

 </div>

 </td>

@@ -76,7 +76,7 @@

 </thead>

 <tr>

 <td class="success">testAffichageBase()</td>

-<td class="success">0.173s</td>

+<td class="success">0.169s</td>

 <td class="success">passed</td>

 </tr>

 </table>

@@ -89,7 +89,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 17:41:14</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 27 nov. 2024, 15:31:35</p>

 </div>

 </div>

 </body>

@@ -41,7 +41,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.015s</div>

+<div class="counter">0.022s</div>

 <p>duration</p>

 </div>

 </td>

@@ -78,7 +78,7 @@

 <tr>

 <td class="success">addMoney</td>

 <td class="success">testAddMoney()</td>

-<td class="success">0.001s</td>

+<td class="success">0s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

@@ -96,19 +96,19 @@

 <tr>

 <td class="success">majDeFinDeTour</td>

 <td class="success">testMajFinTour()</td>

-<td class="success">0.001s</td>

+<td class="success">0.003s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

 <td class="success">Natural Tests</td>

 <td class="success">testNatural()</td>

-<td class="success">0.001s</td>

+<td class="success">0.002s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

 <td class="success">Constructor Player</td>

 <td class="success">testPlayerConstructor()</td>

-<td class="success">0s</td>

+<td class="success">0.001s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

@@ -120,19 +120,19 @@

 <tr>

 <td class="success">removeMoney</td>

 <td class="success">testRemoveMoney()</td>

-<td class="success">0.004s</td>

+<td class="success">0.006s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

 <td class="success">ex &amp; lvl</td>

 <td class="success">testRetrieveLevel()</td>

-<td class="success">0.002s</td>

+<td class="success">0.003s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

 <td class="success">Construcor UpdatePlayer</td>

 <td class="success">testUpdatePlayer()</td>

-<td class="success">0s</td>

+<td class="success">0.001s</td>

 <td class="success">passed</td>

 </tr>

 </table>

@@ -145,7 +145,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 17:41:14</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 27 nov. 2024, 15:31:35</p>

 </div>

 </div>

 </body>

@@ -38,7 +38,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.188s</div>

+<div class="counter">0.191s</div>

 <p>duration</p>

 </div>

 </td>

@@ -85,7 +85,7 @@

 <td>11</td>

 <td>0</td>

 <td>0</td>

-<td>0.188s</td>

+<td>0.191s</td>

 <td class="success">100%</td>

 </tr>

 </tbody>

@@ -112,7 +112,7 @@

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.173s</td>

+<td>0.169s</td>

 <td class="success">100%</td>

 </tr>

 <tr>

@@ -122,7 +122,7 @@

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.015s</td>

+<td>0.022s</td>

 <td class="success">100%</td>

 </tr>

 </tbody>

@@ -136,7 +136,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 17:41:14</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 27 nov. 2024, 15:31:35</p>

 </div>

 </div>

 </body>

@@ -40,7 +40,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.188s</div>

+<div class="counter">0.191s</div>

 <p>duration</p>

 </div>

 </td>

@@ -83,7 +83,7 @@

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.173s</td>

+<td>0.169s</td>

 <td class="success">100%</td>

 </tr>

 <tr>

@@ -93,7 +93,7 @@

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.015s</td>

+<td>0.022s</td>

 <td class="success">100%</td>

 </tr>

 </table>

@@ -106,7 +106,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 24 oct. 2024, 17:41:14</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 27 nov. 2024, 15:31:35</p>

 </div>

 </div>

 </body>

@@ -0,0 +1,248 @@

+#!/bin/sh

+

+#

+# Copyright © 2015-2021 the original authors.

+#

+# Licensed under the Apache License, Version 2.0 (the "License");

+# you may not use this file except in compliance with the License.

+# You may obtain a copy of the License at

+#

+#      https://www.apache.org/licenses/LICENSE-2.0

+#

+# Unless required by applicable law or agreed to in writing, software

+# distributed under the License is distributed on an "AS IS" BASIS,

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+# See the License for the specific language governing permissions and

+# limitations under the License.

+#

+

+##############################################################################

+#

+#   kata start up script for POSIX generated by Gradle.

+#

+#   Important for running:

+#

+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is

+#       noncompliant, but you have some other compliant shell such as ksh or

+#       bash, then to run this script, type that shell name before the whole

+#       command line, like:

+#

+#           ksh kata

+#

+#       Busybox and similar reduced shells will NOT work, because this script

+#       requires all of these POSIX shell features:

+#         * functions;

+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,

+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;

+#         * compound commands having a testable exit status, especially «case»;

+#         * various built-in commands including «command», «set», and «ulimit».

+#

+#   Important for patching:

+#

+#   (2) This script targets any POSIX shell, so it avoids extensions provided

+#       by Bash, Ksh, etc; in particular arrays are avoided.

+#

+#       The "traditional" practice of packing multiple parameters into a

+#       space-separated string is a well documented source of bugs and security

+#       problems, so this is (mostly) avoided, by progressively accumulating

+#       options in "$@", and eventually passing that to Java.

+#

+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,

+#       and KATA_OPTS) rely on word-splitting, this is performed explicitly;

+#       see the in-line comments for details.

+#

+#       There are tweaks for specific operating systems such as AIX, CygWin,

+#       Darwin, MinGW, and NonStop.

+#

+#   (3) This script is generated from the Groovy template

+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt

+#       within the Gradle project.

+#

+#       You can find Gradle at https://github.com/gradle/gradle/.

+#

+##############################################################################

+

+# Attempt to set APP_HOME

+

+# Resolve links: $0 may be a link

+app_path=$0

+

+# Need this for daisy-chained symlinks.

+while

+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path

+    [ -h "$app_path" ]

+do

+    ls=$( ls -ld "$app_path" )

+    link=${ls#*' -> '}

+    case $link in             #(

+      /*)   app_path=$link ;; #(

+      *)    app_path=$APP_HOME$link ;;

+    esac

+done

+

+# This is normally unused

+# shellcheck disable=SC2034

+APP_BASE_NAME=${0##*/}

+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)

+APP_HOME=$( cd "${APP_HOME:-./}.." > /dev/null && pwd -P ) || exit

+

+# Use the maximum available, or set MAX_FD != -1 to use that value.

+MAX_FD=maximum

+

+warn () {

+    echo "$*"

+} >&2

+

+die () {

+    echo

+    echo "$*"

+    echo

+    exit 1

+} >&2

+

+# OS specific support (must be 'true' or 'false').

+cygwin=false

+msys=false

+darwin=false

+nonstop=false

+case "$( uname )" in                #(

+  CYGWIN* )         cygwin=true  ;; #(

+  Darwin* )         darwin=true  ;; #(

+  MSYS* | MINGW* )  msys=true    ;; #(

+  NONSTOP* )        nonstop=true ;;

+esac

+

+CLASSPATH=$APP_HOME/lib/kata-1.0-SNAPSHOT.jar:$APP_HOME/lib/hamcrest-2.2.jar:$APP_HOME/lib/freemarker-2.3.30.jar

+

+

+# Determine the Java command to use to start the JVM.

+if [ -n "$JAVA_HOME" ] ; then

+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then

+        # IBM's JDK on AIX uses strange locations for the executables

+        JAVACMD=$JAVA_HOME/jre/sh/java

+    else

+        JAVACMD=$JAVA_HOME/bin/java

+    fi

+    if [ ! -x "$JAVACMD" ] ; then

+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME

+

+Please set the JAVA_HOME variable in your environment to match the

+location of your Java installation."

+    fi

+else

+    JAVACMD=java

+    if ! command -v java >/dev/null 2>&1

+    then

+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

+

+Please set the JAVA_HOME variable in your environment to match the

+location of your Java installation."

+    fi

+fi

+

+# Increase the maximum file descriptors if we can.

+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then

+    case $MAX_FD in #(

+      max*)

+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.

+        # shellcheck disable=SC2039,SC3045

+        MAX_FD=$( ulimit -H -n ) ||

+            warn "Could not query maximum file descriptor limit"

+    esac

+    case $MAX_FD in  #(

+      '' | soft) :;; #(

+      *)

+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.

+        # shellcheck disable=SC2039,SC3045

+        ulimit -n "$MAX_FD" ||

+            warn "Could not set maximum file descriptor limit to $MAX_FD"

+    esac

+fi

+

+# Collect all arguments for the java command, stacking in reverse order:

+#   * args from the command line

+#   * the main class name

+#   * -classpath

+#   * -D...appname settings

+#   * --module-path (only if needed)

+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and KATA_OPTS environment variables.

+

+# For Cygwin or MSYS, switch paths to Windows format before running java

+if "$cygwin" || "$msys" ; then

+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )

+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

+

+    JAVACMD=$( cygpath --unix "$JAVACMD" )

+

+    # Now convert the arguments - kludge to limit ourselves to /bin/sh

+    for arg do

+        if

+            case $arg in                                #(

+              -*)   false ;;                            # don't mess with options #(

+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath

+                    [ -e "$t" ] ;;                      #(

+              *)    false ;;

+            esac

+        then

+            arg=$( cygpath --path --ignore --mixed "$arg" )

+        fi

+        # Roll the args list around exactly as many times as the number of

+        # args, so each arg winds up back in the position where it started, but

+        # possibly modified.

+        #

+        # NB: a `for` loop captures its iteration list before it begins, so

+        # changing the positional parameters here affects neither the number of

+        # iterations, nor the values presented in `arg`.

+        shift                   # remove old arg

+        set -- "$@" "$arg"      # push replacement arg

+    done

+fi

+

+

+# Add default JVM options here. You can also use JAVA_OPTS and KATA_OPTS to pass JVM options to this script.

+DEFAULT_JVM_OPTS=""

+

+# Collect all arguments for the java command:

+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,

+#     and any embedded shellness will be escaped.

+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be

+#     treated as '${Hostname}' itself on the command line.

+

+set -- \

+        -classpath "$CLASSPATH" \

+        re.forestier.edu.Main \

+        "$@"

+

+# Stop when "xargs" is not available.

+if ! command -v xargs >/dev/null 2>&1

+then

+    die "xargs is not available"

+fi

+

+# Use "xargs" to parse quoted args.

+#

+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

+#

+# In Bash we could simply go:

+#

+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&

+#   set -- "${ARGS[@]}" "$@"

+#

+# but POSIX shell has neither arrays nor command substitution, so instead we

+# post-process each arg (as a line of input to sed) to backslash-escape any

+# character that might be a shell metacharacter, then use eval to reverse

+# that process (while maintaining the separation between arguments), and wrap

+# the whole thing up as a single "set" statement.

+#

+# This will of course break if any of these variables contains a newline or

+# an unmatched quote.

+#

+

+eval "set -- $(

+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $KATA_OPTS" |

+        xargs -n1 |

+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |

+        tr '\n' ' '

+    )" '"$@"'

+

+exec "$JAVACMD" "$@"

@@ -0,0 +1,92 @@

+@rem

+@rem Copyright 2015 the original author or authors.

+@rem

+@rem Licensed under the Apache License, Version 2.0 (the "License");

+@rem you may not use this file except in compliance with the License.

+@rem You may obtain a copy of the License at

+@rem

+@rem      https://www.apache.org/licenses/LICENSE-2.0

+@rem

+@rem Unless required by applicable law or agreed to in writing, software

+@rem distributed under the License is distributed on an "AS IS" BASIS,

+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+@rem See the License for the specific language governing permissions and

+@rem limitations under the License.

+@rem

+

+@if "%DEBUG%"=="" @echo off

+@rem ##########################################################################

+@rem

+@rem  kata startup script for Windows

+@rem

+@rem ##########################################################################

+

+@rem Set local scope for the variables with windows NT shell

+if "%OS%"=="Windows_NT" setlocal

+

+set DIRNAME=%~dp0

+if "%DIRNAME%"=="" set DIRNAME=.

+@rem This is normally unused

+set APP_BASE_NAME=%~n0

+set APP_HOME=%DIRNAME%..

+

+@rem Resolve any "." and ".." in APP_HOME to make it shorter.

+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

+

+@rem Add default JVM options here. You can also use JAVA_OPTS and KATA_OPTS to pass JVM options to this script.

+set DEFAULT_JVM_OPTS=

+

+@rem Find java.exe

+if defined JAVA_HOME goto findJavaFromJavaHome

+

+set JAVA_EXE=java.exe

+%JAVA_EXE% -version >NUL 2>&1

+if %ERRORLEVEL% equ 0 goto execute

+

+echo. 1>&2

+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2

+echo. 1>&2

+echo Please set the JAVA_HOME variable in your environment to match the 1>&2

+echo location of your Java installation. 1>&2

+

+goto fail

+

+:findJavaFromJavaHome

+set JAVA_HOME=%JAVA_HOME:"=%

+set JAVA_EXE=%JAVA_HOME%/bin/java.exe

+

+if exist "%JAVA_EXE%" goto execute

+

+echo. 1>&2

+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2

+echo. 1>&2

+echo Please set the JAVA_HOME variable in your environment to match the 1>&2

+echo location of your Java installation. 1>&2

+

+goto fail

+

+:execute

+@rem Setup the command line

+

+set CLASSPATH=%APP_HOME%\lib\kata-1.0-SNAPSHOT.jar;%APP_HOME%\lib\hamcrest-2.2.jar;%APP_HOME%\lib\freemarker-2.3.30.jar

+

+

+@rem Execute kata

+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %KATA_OPTS%  -classpath "%CLASSPATH%" re.forestier.edu.Main %*

+

+:end

+@rem End local scope for the variables with windows NT shell

+if %ERRORLEVEL% equ 0 goto mainEnd

+

+:fail

+rem Set variable KATA_EXIT_CONSOLE if you need the _script_ return code instead of

+rem the _cmd.exe /c_ return code!

+set EXIT_CODE=%ERRORLEVEL%

+if %EXIT_CODE% equ 0 set EXIT_CODE=1

+if not ""=="%KATA_EXIT_CONSOLE%" exit %EXIT_CODE%

+exit /b %EXIT_CODE%

+

+:mainEnd

+if "%OS%"=="Windows_NT" endlocal

+

+:omega

@@ -1,7 +1,7 @@

 <?xml version="1.0" encoding="UTF-8"?>

-<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-10-24T15:41:14" hostname="a206pc27L.local.isima.fr" time="0.173">

+<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-11-27T14:31:35" hostname="ada.local.isima.fr" time="0.169">

   <properties/>

-  <testcase name="testAffichageBase()" classname="re.forestier.edu.GlobalTest" time="0.173"/>

+  <testcase name="testAffichageBase()" classname="re.forestier.edu.GlobalTest" time="0.169"/>

   <system-out><![CDATA[]]></system-out>

   <system-err><![CDATA[]]></system-err>

 </testsuite>

@@ -1,15 +1,15 @@

 <?xml version="1.0" encoding="UTF-8"?>

-<testsuite name="re.forestier.edu.UnitTests" tests="10" skipped="0" failures="0" errors="0" timestamp="2024-10-24T15:41:14" hostname="a206pc27L.local.isima.fr" time="0.022">

+<testsuite name="re.forestier.edu.UnitTests" tests="10" skipped="0" failures="0" errors="0" timestamp="2024-11-27T14:31:35" hostname="ada.local.isima.fr" time="0.029">

   <properties/>

   <testcase name="Main" classname="re.forestier.edu.UnitTests" time="0.005"/>

-  <testcase name="removeMoney" classname="re.forestier.edu.UnitTests" time="0.004"/>

-  <testcase name="ex &amp; lvl" classname="re.forestier.edu.UnitTests" time="0.002"/>

-  <testcase name="addMoney" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="removeMoney" classname="re.forestier.edu.UnitTests" time="0.006"/>

+  <testcase name="ex &amp; lvl" classname="re.forestier.edu.UnitTests" time="0.003"/>

+  <testcase name="addMoney" classname="re.forestier.edu.UnitTests" time="0.0"/>

   <testcase name="Heal and hurt" classname="re.forestier.edu.UnitTests" time="0.001"/>

-  <testcase name="Construcor UpdatePlayer" classname="re.forestier.edu.UnitTests" time="0.0"/>

-  <testcase name="majDeFinDeTour" classname="re.forestier.edu.UnitTests" time="0.001"/>

-  <testcase name="Constructor Player" classname="re.forestier.edu.UnitTests" time="0.0"/>

-  <testcase name="Natural Tests" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="Construcor UpdatePlayer" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="majDeFinDeTour" classname="re.forestier.edu.UnitTests" time="0.003"/>

+  <testcase name="Constructor Player" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="Natural Tests" classname="re.forestier.edu.UnitTests" time="0.002"/>

   <testcase name="Sample test" classname="re.forestier.edu.UnitTests" time="0.0"/>

   <system-out><![CDATA[]]></system-out>

   <system-err><![CDATA[]]></system-err>

@@ -2,12 +2,13 @@ package re.forestier.edu;

 import re.forestier.edu.rpg.Affichage;

 import re.forestier.edu.rpg.UpdatePlayer;

 import re.forestier.edu.rpg.Player;

+import re.forestier.edu.rpg.Jobs;

 import java.util.ArrayList;

 public class Main {

     public static void main(String[] args) {

-        Player firstPlayer = new Player("Florian", "Ruzberg de Rivehaute", "DWARF", 200, new ArrayList<>());

+        Player firstPlayer = new Player("Florian", "Ruzberg de Rivehaute", Jobs.DWARF, 200, new ArrayList<>());

         firstPlayer.addMoney(400);

         firstPlayer.addXp(15);

@@ -1,3 +1,20 @@

 package re.forestier.edu.rpg;

-public enum Ability{INT,DEF,ATK,CHA,ALC,VIS};

\ No newline at end of file

+public enum Ability{

+    ALC("ALC"),

+    ATK("ATK"),

+    CHA("CHA"),

+    DEF("DEF"),

+    INT("INT"),

+    VIS("VIS");

+

+    private final String name;

+    private Ability(String name) {

+        this.name = name;

+    }

+

+    public String toString()

+    {

+        return this.name;

+    }     

+};

\ No newline at end of file

@@ -5,5 +5,6 @@ import java.util.HashMap;

 public interface Job

 {

     public static final int maxLevel = 5;

+    public String name = "";

     public HashMap<Ability, Integer[]> abilityPerLevel = new HashMap<Ability,Integer[]>();

 }

\ No newline at end of file

@@ -8,35 +8,47 @@ public enum Jobs implements Job

 {

     ADVENTURER

     { 

-        public HashMap<Ability, Integer[]> abilityPerLevel = new HashMap(Map.ofEntries(

-            entry(Ability.INT, new Integer[]{1,2,2,2,2}),

-            entry(Ability.DEF, new Integer[]{1,1,1,3,4}),

+        public String name = "ADVENTURER";

+        public HashMap<Ability, Integer[]> getAbilityPerLevel(){ 

+            return new HashMap(Map.ofEntries(

+            entry(Ability.ALC, new Integer[]{0,0,1,1,1}),

             entry(Ability.ATK, new Integer[]{3,3,5,5,5}),

             entry(Ability.CHA, new Integer[]{2,3,3,3,3}),

-            entry(Ability.ALC, new Integer[]{1,2,2,2,2}),

+            entry(Ability.DEF, new Integer[]{1,1,1,3,4}),

+            entry(Ability.INT, new Integer[]{1,2,2,2,2}),

             entry(Ability.VIS, new Integer[]{0,0,0,0,1})

         ));

+        } 

     },

     ARCHER

     {

-        public HashMap<Ability, Integer[]> abilityPerLevel = new HashMap(Map.ofEntries(

-            entry(Ability.INT, new Integer[]{1,1,1,1,1}),

-            entry(Ability.DEF, new Integer[]{0,1,1,2,2}),

+        public String name = "ARCHER";

+        public HashMap<Ability, Integer[]> getAbilityPerLevel(){

+            return new HashMap(Map.ofEntries(

+            entry(Ability.ALC, new Integer[]{0,0,0,0,0}),

             entry(Ability.ATK, new Integer[]{3,3,3,3,4}),

             entry(Ability.CHA, new Integer[]{1,2,2,2,2}),

-            entry(Ability.ALC, new Integer[]{0,0,0,0,0}),

+            entry(Ability.DEF, new Integer[]{0,1,1,2,2}),

+            entry(Ability.INT, new Integer[]{1,1,1,1,1}),

             entry(Ability.VIS, new Integer[]{3,3,3,3,3})

         ));

+        } 

     },

     DWARF

     {

-        public HashMap<Ability, Integer[]> abilityPerLevel = new HashMap(Map.ofEntries(

-            entry(Ability.INT, new Integer[]{1,1,1,1,1}),

-            entry(Ability.DEF, new Integer[]{0,1,1,2,2}),

+        public String name = "DWARF";

+        public HashMap<Ability, Integer[]> getAbilityPerLevel(){

+            return new HashMap(Map.ofEntries(

+            entry(Ability.ALC, new Integer[]{4,4,5,5,5}),

             entry(Ability.ATK, new Integer[]{3,3,4,4,4}),

             entry(Ability.CHA, new Integer[]{0,0,0,0,1}),

-            entry(Ability.ALC, new Integer[]{4,4,5,5,5}),

+            entry(Ability.DEF, new Integer[]{0,1,1,2,2}),

+            entry(Ability.INT, new Integer[]{1,1,1,1,1}),

             entry(Ability.VIS, new Integer[]{0,0,0,0,0})

         ));

         }

+    };

+

+

+    public abstract HashMap<Ability, Integer[]> getAbilityPerLevel();

 }

\ No newline at end of file

@@ -3,6 +3,7 @@ package re.forestier.edu.rpg;

 import java.util.Random;

 import java.util.ArrayList;

 import java.util.HashMap;

+import java.util.Collections;

 import re.forestier.edu.lib.Natural;

 public class Player {

@@ -12,7 +13,8 @@ public class Player {

     private String playerName;

     private String avatarName;

-    private String avatarClass;

+    //private String avatarClass;

+    public Jobs avatarClass;

     private Natural money;

@@ -21,25 +23,21 @@ public class Player {

     private Natural currentHealthPoints;

     private Natural xp;

-    public HashMap<String, Integer> abilities; //Ability = stat

+    public HashMap<Ability, Integer> abilities; //Ability = stat

     public ArrayList<String> inventory;

-    public Player(String playerName, String avatar_name, String avatarClass, int money, ArrayList<String> inventory) {

+    public Player(String playerName, String avatar_name, Jobs avatarClass, int money, ArrayList<String> inventory) {

         this(playerName,avatar_name,avatarClass,money,inventory,Player.defaultMaxHp.toInt());

     }

     private Player()

     {

         //Here to prevent the compilator to create default constructor

+        //TODO throw exception

     }

-    public Player(String playerName, String avatar_name, String avatarClass, int money, ArrayList<String> inventory, int maxHp)

+    public Player(String playerName, String avatar_name, Jobs avatarClass, int money, ArrayList<String> inventory, int maxHp)

     {

-        if (!avatarClass.equals("ARCHER") && !avatarClass.equals("ADVENTURER") && !avatarClass.equals("DWARF")) 

-        {

-            return;

-        }

-

         this.playerName = playerName;

         this.avatarName = avatar_name;

         this.avatarClass = avatarClass;

@@ -47,7 +45,11 @@ public class Player {

         this.inventory = inventory;

         this.level = Natural.valueOf(1);

         this.xp = Natural.valueOf(0);

-        this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(this.avatarClass).get(1);

+        this.abilities = new HashMap<Ability, Integer>();

+        avatarClass.getAbilityPerLevel().forEach((ability,value)->

+            {this.abilities.put(ability,value[0]);}

+        );

+

         this.maxHealthPoint = Natural.valueOf(maxHp);

         this.currentHealthPoints = Natural.valueOf(maxHp);

     }

@@ -110,7 +112,7 @@ public class Player {

         return this.xp.toInt();

     }

-    public String getAvatarClass () {

+    public Jobs getAvatarClass () {

         return this.avatarClass;

     }

@@ -128,15 +130,13 @@ public class Player {

         if (!ancientLevel.equals(this.level)) {

             // Player leveled-up!

             // Give a random object

-            ;

             Random random = new Random();

             this.inventory.add(UpdatePlayer.objectList[random.nextInt(UpdatePlayer.objectList.length)]);

             // Add/upgrade abilities to player

-            HashMap<String, Integer> abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(this.getAvatarClass()).get(this.level.toInt());

-            abilities.forEach((ability, level) -> {

-                this.abilities.put(ability, abilities.get(ability));

-            });

+            avatarClass.getAbilityPerLevel().forEach((ability,value)->

+                {this.abilities.put(ability,value[this.level.toInt()-1]);}

+            );

         }

     }

@@ -167,9 +167,23 @@ public class Player {

         sb.append(" (XP totale : ");

         sb.append(this.xp);

         sb.append(")\n\nCapacités :");

-        this.abilities.forEach((name, level) -> {

-            sb.append("\n   " + name + " : " + level);

-        });

+

+        ArrayList<Ability> abilitiesKey = new ArrayList<Ability>(this.abilities.keySet());

+        Collections.sort(abilitiesKey);

+        for(Ability a : abilitiesKey)

+        {

+            if(this.abilities.get(a) != 0)

+            {

+                sb.append("\n   " + a.toString() + " : " + this.abilities.get(a));

+            } 

+        } 

+

+        /*this.abilities.forEach((ability, level) -> {

+            if(level != 0)

+            {

+                sb.append("\n   " + ability.toString() + " : " + level);

+            } 

+        });*/

         sb.append("\n\nInventaire :");

         this.inventory.forEach(item -> {

             sb.append("\n   " + item);

@@ -8,96 +8,6 @@ public class UpdatePlayer {

     public final static String[] objectList = {"Magic bow : Heal by 1/8th of your HP","Lookout Ring : Prevents surprise attacks","Scroll of Stupidity : INT-2 when applied to an enemy", "Draupnir : Increases XP gained by 100%", "Magic Charm : Magic +10 for 5 rounds", "Rune Staff of Curse : May burn your ennemies... Or yourself. Who knows?", "Combat Edge : Well, that's an edge", "Holy Elixir : Recover your HP"

     };

-    public static HashMap<String, HashMap<Integer, HashMap<String, Integer>>> abilitiesPerTypeAndLevel() {

-        HashMap<String, HashMap<Integer, HashMap<String, Integer>>> abilitiesPerTypeAndLevel = new HashMap<>();

-

-        HashMap<Integer, HashMap<String, Integer>> adventurerMap = new HashMap<>();

-        HashMap<String, Integer> adventurerLevel1 = new HashMap<>();

-        adventurerLevel1.put("INT", 1);

-        adventurerLevel1.put("DEF", 1);

-        adventurerLevel1.put("ATK", 3);

-        adventurerLevel1.put("CHA", 2);

-        adventurerMap.put(1, adventurerLevel1);

-

-        HashMap<String, Integer> adventurerLevel2 = new HashMap<>();

-        adventurerLevel1.put("INT", 2);

-        adventurerLevel1.put("CHA", 3);

-        adventurerMap.put(2, adventurerLevel2);

-

-        HashMap<String, Integer> adventurerLevel3 = new HashMap<>();

-        adventurerLevel3.put("ATK", 5);

-        adventurerLevel3.put("ALC", 1);

-        adventurerMap.put(3, adventurerLevel3);

-

-        HashMap<String, Integer> adventurerLevel4 = new HashMap<>();

-        adventurerLevel4.put("DEF", 3);

-        adventurerMap.put(4, adventurerLevel4);

-

-        HashMap<String, Integer> adventurerLevel5 = new HashMap<>();

-        adventurerLevel5.put("VIS", 1);

-        adventurerLevel5.put("DEF", 4);

-        adventurerMap.put(5, adventurerLevel5);

-

-        abilitiesPerTypeAndLevel.put("ADVENTURER", adventurerMap);

-

-

-        HashMap<Integer, HashMap<String, Integer>> archerMap = new HashMap<>();

-        HashMap<String, Integer> archerLevel1 = new HashMap<>();

-        archerLevel1.put("INT", 1);

-        archerLevel1.put("ATK", 3);

-        archerLevel1.put("CHA", 1);

-        archerLevel1.put("VIS", 3);

-        archerMap.put(1, archerLevel1);

-

-        HashMap<String, Integer> archerLevel2 = new HashMap<>();

-        archerLevel2.put("DEF", 1);

-        archerLevel2.put("CHA", 2);

-        archerMap.put(2, archerLevel2);

-

-        HashMap<String, Integer> archerLevel3 = new HashMap<>();

-        archerLevel3.put("ATK", 3);

-        archerMap.put(3, archerLevel3);

-

-        HashMap<String, Integer> archerLevel4 = new HashMap<>();

-        archerLevel4.put("DEF", 2);

-        archerMap.put(4, archerLevel4);

-

-        HashMap<String, Integer> archerLevel5 = new HashMap<>();

-        archerLevel5.put("ATK", 4);

-        archerMap.put(5, archerLevel5);

-

-        abilitiesPerTypeAndLevel.put("ARCHER", archerMap);

-

-

-        HashMap<Integer, HashMap<String, Integer>> dwarf = new HashMap<>();

-        HashMap<String, Integer> dwarfLevel1 = new HashMap<>();

-        dwarfLevel1.put("ALC", 4);

-        dwarfLevel1.put("INT", 1);

-        dwarfLevel1.put("ATK", 3);

-        dwarf.put(1, dwarfLevel1);

-

-        HashMap<String, Integer> dwarfLevel2 = new HashMap<>();

-        dwarfLevel2.put("DEF", 1);

-        dwarfLevel2.put("ALC", 5);

-        dwarf.put(2, dwarfLevel2);

-

-        HashMap<String, Integer> dwarfLevel3 = new HashMap<>();

-        dwarfLevel3.put("ATK", 4);

-        dwarf.put(3, dwarfLevel3);

-

-        HashMap<String, Integer> dwarfLevel4 = new HashMap<>();

-        dwarfLevel4.put("DEF", 2);

-        dwarf.put(4, dwarfLevel4);

-

-        HashMap<String, Integer> dwarfLevel5 = new HashMap<>();

-        dwarfLevel5.put("CHA", 1);

-        dwarf.put(5, dwarfLevel5);

-

-        abilitiesPerTypeAndLevel.put("DWARF", dwarf);

-

-        return abilitiesPerTypeAndLevel;

-    }

-

     // majFinDeTour met à jour les points de vie