integration entier naturel et ajout surcharge opérateur (ne marche pas) (4531fec) - Kata refactoring · Portfolio Code

integration entier naturel et ajout surcharge opérateur (ne marche pas)

Parent c113132

Clement COLMERAUER commited on 2024-10-07 12:16:36
Showing 8 changed files, with 46 additions and 39 deletions.

.gradle/8.8/fileHashes/fileHashes.bin 17b16d3..32bdb3c
.gradle/8.8/fileHashes/fileHashes.lock 721cd6b..6055802
.gradle/8.8/fileHashes/resourceHashesCache.bin d86105b..20e1cb7
.gradle/buildOutputCleanup/buildOutputCleanup.lock b30154c..367680d
src/main/javre/forestier/edu/Main.java e4ecd86..1d3c6f0
src/main/javre/forestier/edu/rpg/Player.java 8d40de7..3f42f2e
src/main/javre/forestier/edu/rpg/UpdatePlayer.java 9d35e9e..3d31bdd
src/test/javre/forestier/edu/UnitTests.java b48c27f..a75c3ac

.gradle/8.8/fileHashes/fileHashes.bin

View file @ 4531fec

.gradle/8.8/fileHashes/fileHashes.lock

View file @ 4531fec

.gradle/8.8/fileHashes/resourceHashesCache.bin

View file @ 4531fec

.gradle/buildOutputCleanup/buildOutputCleanup.lock

View file @ 4531fec

src/main/javre/forestier/edu/Main.java

View file @ 4531fec

@@ -2,18 +2,19 @@ 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.lib.Natural;
 
 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<>());
-        firstPlayer.addMoney(400);
+        firstPlayer.addMoney(Natural.valueOf(400));
 
-        firstPlayer.addXp(15);
+        firstPlayer.addXp(Natural.valueOf(15));
         System.out.println(Affichage.afficherJoueur(firstPlayer));
         System.out.println("------------------");
-        firstPlayer.addXp(20);
+        firstPlayer.addXp(Natural.valueOf(20));
         System.out.println(Affichage.afficherJoueur(firstPlayer));
     }
 }
\ No newline at end of file

src/main/javre/forestier/edu/rpg/Player.java

View file @ 4531fec

@@ -3,6 +3,7 @@ package re.forestier.edu.rpg;
 import java.util.Random;
 import java.util.ArrayList;
 import java.util.HashMap;
+import re.forestier.edu.lib.Natural;
 
 public class Player {
     private static final Integer[] xpForlevel = {0,10,27,57,111}; //Level = i+1 
@@ -12,13 +13,12 @@ public class Player {
     private String Avatar_name;
     private String AvatarClass;
 
-    private Integer money;
-    private Float __real_money__;
+    private Natural money;
 
-    private int level;
-    private int healthpoints;
-    private int currenthealthpoints;
-    private int xp;
+    private Natural level;
+    private Natural healthpoints;
+    private Natural currenthealthpoints;
+    private Natural xp;
 
     public HashMap<String, Integer> abilities; //Ability = stat
     public ArrayList<String> inventory;
@@ -32,10 +32,10 @@ public class Player {
         this.playerName = playerName;
         Avatar_name = avatar_name;
         AvatarClass = avatarClass;
-        this.money = Integer.valueOf(money);
+        this.money = Natural.valueOf(money);
         this.inventory = inventory;
-        this.level = 1;
-        this.xp = 0;
+        this.level = Natural.valueOf(1);
+        this.xp = Natural.valueOf(0);
         this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(AvatarClass).get(1);
     }
 
@@ -49,42 +49,42 @@ public class Player {
         return this.Avatar_name;
     }
             
-    public Integer getMoney()
+    public Natural getMoney()
     {
         return this.money;
     }
 
-    public int getLevel()
+    public Natural getLevel()
     {
         return this.level;
     }
 
-    public int getHealthPoints()
+    public Natural getHealthPoints()
     {
         return this.healthpoints;
     }
 
-    public void setHealthPoints(int hp)
+    public void setHealthPoints(Natural hp)
     {
-        this.healthpoints = hp;
+        this.healthpoints = hp.clone();
     }
 
-    public int getCurrentHealthPoints()
+    public Natural getCurrentHealthPoints()
     {
-        return this.currenthealthpoints;
+        return this.currenthealthpoints.clone();
     }
 
     public void setCurrentHealthPoints(int hp)
     {
-        this.currenthealthpoints = hp;
+        this.currenthealthpoints = hp.clone();
     }
 
-    public int getXp()
+    public Natural getXp()
     {
         return this.xp;
     }
 
-    public void setXp(int xp)
+    public void setXp(Natural xp)
     {
         this.xp = xp;
     }
@@ -93,18 +93,18 @@ public class Player {
         return AvatarClass;
     }
 
-    public void addXp(int xp) {
-        int ancientLevel = this.level;
-        this.xp += xp;
+    public void addXp(Natural xp) {
+        Natural ancientLevel = this.level;
+        this.xp.add(xp);
         int i = 0;
         while(i < xpForlevel.length && this.xp >= xpForlevel[i])
         {
             i++;
         }
 
-        this.level = i;
+        this.level = Natural.valueof(i);
 
-        if (this.level != ancientLevel) {
+        if (this.level.compareTo(ancientLevel) == -1) {
             // Player leveled-up!
             // Give a random object
             ;
@@ -119,14 +119,16 @@ public class Player {
         }
     }
 
-    public void removeMoney(int amount) throws IllegalArgumentException {
+    public void removeMoney(Natural amount)
+    {
         if (money - amount < 0) {
             throw new IllegalArgumentException("Player can't have a negative money!");
         }
 
-        money = Integer.parseInt(money.toString()) - amount;
+        money.remove(amount);
     }
-    public void addMoney(int amount) { 
-        money = money + amount;
+
+    public void addMoney(Natural amount) { 
+        money.add(amount);
     }
 }
\ No newline at end of file

src/main/javre/forestier/edu/rpg/UpdatePlayer.java

View file @ 4531fec

@@ -2,6 +2,7 @@ package re.forestier.edu.rpg;
 
 import java.util.HashMap;
 import java.util.Random;
+import re.forestier.edu.lib.Natural;
 
 public class UpdatePlayer {
 
@@ -100,31 +101,31 @@ public class UpdatePlayer {
 
     // majFinDeTour met à jour les points de vie
     public static void majFinDeTour(Player player) {
-        if(player.getCurrentHealthPoints() == 0) {
+        if(player.getCurrentHealthPoints().equals(Natural.ZERO)) {
             System.out.println("Le joueur est KO !");
             return;
         }
 
-        if(player.getCurrentHealthPoints() < player.getHealthPoints()/2) {
+        if(player.getCurrentHealthPoints().compareTo(Natural.divide(player.getHealthPoints(),2)) == 1 ) {
             if(!player.getAvatarClass().equals("ADVENTURER")) {
                 if(player.getAvatarClass().equals("DWARF")) {
                     if(player.inventory.contains("Holy Elixir")) {
-                        player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
+                        player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));
                     }
-                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
+                    player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));
                 }
 
 
                 if(player.getAvatarClass().equals("ARCHER")) {
-                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
+                    player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));
                     if(player.inventory.contains("Magic Bow")) {
-                        player.setCurrentHealthPoints(player.getCurrentHealthPoints()+player.getCurrentHealthPoints()/8-1);
+                        player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(), Natural.substract(Natural.divide(player.getCurrentHealthPoints(),8),1),player.getCurrentHealthPoints))
                     }
                 }
             } else {
                 player.setCurrentHealthPoints(player.getCurrentHealthPoints()+2);
-                if(player.getLevel() < 3) {
-                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()-1);
+                if(player.getLevel().compareTo(Natural.valueOf(3)) == 1) {
+                    player.setCurrentHealthPoints(player.getCurrentHealthPoints().substract(1));
                 }
             }
         } else 

src/test/javre/forestier/edu/UnitTests.java

View file @ 4531fec

@@ -229,6 +229,9 @@ public class UnitTests {
         assertEquals(n.substract(Natural.valueOf(2)),Natural.valueOf(0));
         assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(0).substract(Natural.valueOf(4)));
 
+        assertEquals(Natural.valueOf(4).divide(Natural.valueOf(2)),Natural.valueOf(2));
+        assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(0).divide(null));
+
         assertEquals(n.toString(),"2");
         assertTrue(n.equals(Natural.valueOf(2)));
         assertTrue(n.equals(n));


...	...	@@ -2,6 +2,7 @@ package re.forestier.edu.rpg;
2	2
3	3	import java.util.HashMap;
4	4	import java.util.Random;
	5	+import re.forestier.edu.lib.Natural;
5	6
6	7	public class UpdatePlayer {
7	8
...	...	@@ -100,31 +101,31 @@ public class UpdatePlayer {
100	101
101	102	// majFinDeTour met à jour les points de vie
102	103	public static void majFinDeTour(Player player) {
103		- if(player.getCurrentHealthPoints() == 0) {
	104	+ if(player.getCurrentHealthPoints().equals(Natural.ZERO)) {
104	105	System.out.println("Le joueur est KO !");
105	106	return;
106	107	}
107	108
108		- if(player.getCurrentHealthPoints() < player.getHealthPoints()/2) {
	109	+ if(player.getCurrentHealthPoints().compareTo(Natural.divide(player.getHealthPoints(),2)) == 1 ) {
109	110	if(!player.getAvatarClass().equals("ADVENTURER")) {
110	111	if(player.getAvatarClass().equals("DWARF")) {
111	112	if(player.inventory.contains("Holy Elixir")) {
112		- player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
	113	+ player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));
113	114	}
114		- player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
	115	+ player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));
115	116	}
116	117
117	118
118	119	if(player.getAvatarClass().equals("ARCHER")) {
119		- player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);
	120	+ player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));
120	121	if(player.inventory.contains("Magic Bow")) {
121		- player.setCurrentHealthPoints(player.getCurrentHealthPoints()+player.getCurrentHealthPoints()/8-1);
	122	+ player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(), Natural.substract(Natural.divide(player.getCurrentHealthPoints(),8),1),player.getCurrentHealthPoints))
122	123	}
123	124	}
124	125	} else {
125	126	player.setCurrentHealthPoints(player.getCurrentHealthPoints()+2);
126		- if(player.getLevel() < 3) {
127		- player.setCurrentHealthPoints(player.getCurrentHealthPoints()-1);
	127	+ if(player.getLevel().compareTo(Natural.valueOf(3)) == 1) {
	128	+ player.setCurrentHealthPoints(player.getCurrentHealthPoints().substract(1));
128	129	}
129	130	}
130	131	} else

...	...	@@ -229,6 +229,9 @@ public class UnitTests {
229	229	assertEquals(n.substract(Natural.valueOf(2)),Natural.valueOf(0));
230	230	assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(0).substract(Natural.valueOf(4)));
231	231
	232	+ assertEquals(Natural.valueOf(4).divide(Natural.valueOf(2)),Natural.valueOf(2));
	233	+ assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(0).divide(null));
	234	+
232	235	assertEquals(n.toString(),"2");
233	236	assertTrue(n.equals(Natural.valueOf(2)));
234	237	assertTrue(n.equals(n));
235	238

...	...	@@ -2,18 +2,19 @@ package re.forestier.edu;
2	2	import re.forestier.edu.rpg.Affichage;
3	3	import re.forestier.edu.rpg.UpdatePlayer;
4	4	import re.forestier.edu.rpg.Player;
	5	+import re.forestier.edu.lib.Natural;
5	6
6	7	import java.util.ArrayList;
7	8
8	9	public class Main {
9	10	public static void main(String[] args) {
10	11	Player firstPlayer = new Player("Florian", "Ruzberg de Rivehaute", "DWARF", 200, new ArrayList<>());
11		- firstPlayer.addMoney(400);
	12	+ firstPlayer.addMoney(Natural.valueOf(400));
12	13
13		- firstPlayer.addXp(15);
	14	+ firstPlayer.addXp(Natural.valueOf(15));
14	15	System.out.println(Affichage.afficherJoueur(firstPlayer));
15	16	System.out.println("------------------");
16		- firstPlayer.addXp(20);
	17	+ firstPlayer.addXp(Natural.valueOf(20));
17	18	System.out.println(Affichage.afficherJoueur(firstPlayer));
18	19	}
19	20	}
20	21	\ No newline at end of file

...	...	@@ -3,6 +3,7 @@ package re.forestier.edu.rpg;
3	3	import java.util.Random;
4	4	import java.util.ArrayList;
5	5	import java.util.HashMap;
	6	+import re.forestier.edu.lib.Natural;
6	7
7	8	public class Player {
8	9	private static final Integer[] xpForlevel = {0,10,27,57,111}; //Level = i+1
...	...	@@ -12,13 +13,12 @@ public class Player {
12	13	private String Avatar_name;
13	14	private String AvatarClass;
14	15
15		- private Integer money;
16		- private Float __real_money__;
	16	+ private Natural money;
17	17
18		- private int level;
19		- private int healthpoints;
20		- private int currenthealthpoints;
21		- private int xp;
	18	+ private Natural level;
	19	+ private Natural healthpoints;
	20	+ private Natural currenthealthpoints;
	21	+ private Natural xp;
22	22
23	23	public HashMap<String, Integer> abilities; //Ability = stat
24	24	public ArrayList<String> inventory;
...	...	@@ -32,10 +32,10 @@ public class Player {
32	32	this.playerName = playerName;
33	33	Avatar_name = avatar_name;
34	34	AvatarClass = avatarClass;
35		- this.money = Integer.valueOf(money);
	35	+ this.money = Natural.valueOf(money);
36	36	this.inventory = inventory;
37		- this.level = 1;
38		- this.xp = 0;
	37	+ this.level = Natural.valueOf(1);
	38	+ this.xp = Natural.valueOf(0);
39	39	this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(AvatarClass).get(1);
40	40	}
41	41
...	...	@@ -49,42 +49,42 @@ public class Player {
49	49	return this.Avatar_name;
50	50	}
51	51
52		- public Integer getMoney()
	52	+ public Natural getMoney()
53	53	{
54	54	return this.money;
55	55	}
56	56
57		- public int getLevel()
	57	+ public Natural getLevel()
58	58	{
59	59	return this.level;
60	60	}
61	61
62		- public int getHealthPoints()
	62	+ public Natural getHealthPoints()
63	63	{
64	64	return this.healthpoints;
65	65	}
66	66
67		- public void setHealthPoints(int hp)
	67	+ public void setHealthPoints(Natural hp)
68	68	{
69		- this.healthpoints = hp;
	69	+ this.healthpoints = hp.clone();
70	70	}
71	71
72		- public int getCurrentHealthPoints()
	72	+ public Natural getCurrentHealthPoints()
73	73	{
74		- return this.currenthealthpoints;
	74	+ return this.currenthealthpoints.clone();
75	75	}
76	76
77	77	public void setCurrentHealthPoints(int hp)
78	78	{
79		- this.currenthealthpoints = hp;
	79	+ this.currenthealthpoints = hp.clone();
80	80	}
81	81
82		- public int getXp()
	82	+ public Natural getXp()
83	83	{
84	84	return this.xp;
85	85	}
86	86
87		- public void setXp(int xp)
	87	+ public void setXp(Natural xp)
88	88	{
89	89	this.xp = xp;
90	90	}
...	...	@@ -93,18 +93,18 @@ public class Player {
93	93	return AvatarClass;
94	94	}
95	95
96		- public void addXp(int xp) {
97		- int ancientLevel = this.level;
98		- this.xp += xp;
	96	+ public void addXp(Natural xp) {
	97	+ Natural ancientLevel = this.level;
	98	+ this.xp.add(xp);
99	99	int i = 0;
100	100	while(i < xpForlevel.length && this.xp >= xpForlevel[i])
101	101	{
102	102	i++;
103	103	}
104	104
105		- this.level = i;
	105	+ this.level = Natural.valueof(i);
106	106
107		- if (this.level != ancientLevel) {
	107	+ if (this.level.compareTo(ancientLevel) == -1) {
108	108	// Player leveled-up!
109	109	// Give a random object
110	110	;
...	...	@@ -119,14 +119,16 @@ public class Player {
119	119	}
120	120	}
121	121
122		- public void removeMoney(int amount) throws IllegalArgumentException {
	122	+ public void removeMoney(Natural amount)
	123	+ {
123	124	if (money - amount < 0) {
124	125	throw new IllegalArgumentException("Player can't have a negative money!");
125	126	}
126	127
127		- money = Integer.parseInt(money.toString()) - amount;
	128	+ money.remove(amount);
128	129	}
129		- public void addMoney(int amount) {
130		- money = money + amount;
	130	+
	131	+ public void addMoney(Natural amount) {
	132	+ money.add(amount);
131	133	}
132	134	}
133	135	\ No newline at end of file