From b37a111c35317f3dc5a4b57f6ea45021c52f7914 Mon Sep 17 00:00:00 2001 From: Kruss Date: Thu, 14 May 2020 21:44:34 +0200 Subject: [PATCH] =?UTF-8?q?regl=C3=A9=20erreurs=20pt2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/database/CreatingCardsTest.java | 2 +- src/main/CarteLieu.java | 41 ----------------------------- src/main/Equipement.java | 5 ---- src/main/Type.java | 5 ---- src/main/TypeLumiere.java | 5 ---- src/main/TypeTenebre.java | 5 ---- src/main/TypeVision.java | 5 ---- src/tmpmeth/DamageCalculator.java | 13 --------- src/tmpmeth/Dice.java | 24 ----------------- src/tmpmeth/start.java | 13 --------- 10 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 src/main/CarteLieu.java delete mode 100644 src/main/Equipement.java delete mode 100644 src/main/Type.java delete mode 100644 src/main/TypeLumiere.java delete mode 100644 src/main/TypeTenebre.java delete mode 100644 src/main/TypeVision.java delete mode 100644 src/tmpmeth/DamageCalculator.java delete mode 100644 src/tmpmeth/Dice.java delete mode 100644 src/tmpmeth/start.java diff --git a/src/database/CreatingCardsTest.java b/src/database/CreatingCardsTest.java index 940d278..45f4719 100644 --- a/src/database/CreatingCardsTest.java +++ b/src/database/CreatingCardsTest.java @@ -282,7 +282,7 @@ public class CreatingCardsTest { DatabaseManager.queryInsertObject(66,lieu5); // 66 - CarteLieu lieu6 = new CarteLieu(new Point(-1,9)); + CarteLieu lieu6 = new CarteLieu(new Point(-1,10)); lieu6.setEffet(new EffetChoisirCible(new ActionVoler(ActionVoler.VOLER))); DatabaseManager.queryInsertObject(67,lieu6); diff --git a/src/main/CarteLieu.java b/src/main/CarteLieu.java deleted file mode 100644 index 5b0cbf5..0000000 --- a/src/main/CarteLieu.java +++ /dev/null @@ -1,41 +0,0 @@ -package main; -import java.util.List; - -public class CarteLieu { - private List valeurs; - private List joueurs; - private String nom; - private CarteLieu voisin; - private Plateau plateau; - - public CarteLieu(String n, List vals, CarteLieu vois, Plateau plat){ - nom = n; - for(int i : vals) { - //max 2 v par lieu normalement - valeurs.add(i); - } - voisin = vois; - plateau = plat; - } - - //pour rajouter un joueur au lieu - public void addJoueur(Joueur j) { - joueurs.add(j); - } - - public List getJoueursAdjacents() { - return voisin.getJoueurs(); - } - - public void utiliser(Joueur j) {}; - - public List getJoueurs() { - return joueurs; - } - - //pour enlever un joueur du lieu - public void removeJoueur(Joueur j) { - joueurs.remove(j); //pas sur que ca va marcher - } - -} diff --git a/src/main/Equipement.java b/src/main/Equipement.java deleted file mode 100644 index 4883916..0000000 --- a/src/main/Equipement.java +++ /dev/null @@ -1,5 +0,0 @@ -package main; - -public class Equipement { - -} diff --git a/src/main/Type.java b/src/main/Type.java deleted file mode 100644 index 425c5e8..0000000 --- a/src/main/Type.java +++ /dev/null @@ -1,5 +0,0 @@ -package main; - -public interface Type { - -} diff --git a/src/main/TypeLumiere.java b/src/main/TypeLumiere.java deleted file mode 100644 index b6aeaf2..0000000 --- a/src/main/TypeLumiere.java +++ /dev/null @@ -1,5 +0,0 @@ -package main; - -public class TypeLumiere implements Type { - -} diff --git a/src/main/TypeTenebre.java b/src/main/TypeTenebre.java deleted file mode 100644 index 1704735..0000000 --- a/src/main/TypeTenebre.java +++ /dev/null @@ -1,5 +0,0 @@ -package main; - -public class TypeTenebre implements Type{ - -} diff --git a/src/main/TypeVision.java b/src/main/TypeVision.java deleted file mode 100644 index 81a329f..0000000 --- a/src/main/TypeVision.java +++ /dev/null @@ -1,5 +0,0 @@ -package main; - -public class TypeVision implements Type { - -} diff --git a/src/tmpmeth/DamageCalculator.java b/src/tmpmeth/DamageCalculator.java deleted file mode 100644 index 65e71d9..0000000 --- a/src/tmpmeth/DamageCalculator.java +++ /dev/null @@ -1,13 +0,0 @@ -package tmpmeth; - -public class DamageCalculator { - - public static int calculDamage(Dice d6, Dice d4) { - int r = d6.roll() - d4.roll(); - if(r < 0) { - r = 0; - } - return r; - } -} - diff --git a/src/tmpmeth/Dice.java b/src/tmpmeth/Dice.java deleted file mode 100644 index 54d6040..0000000 --- a/src/tmpmeth/Dice.java +++ /dev/null @@ -1,24 +0,0 @@ -package tmpmeth; -import java.lang.Math; - -public class Dice { - - private int max; - - public Dice() { - this(0); - } - - public Dice(int m) { - this.max = m; - } - - public int roll() { - return (int)((max)*Math.random())+1; - } - - public int getMax() { - return this.max; - } - -} diff --git a/src/tmpmeth/start.java b/src/tmpmeth/start.java deleted file mode 100644 index bb2c7d8..0000000 --- a/src/tmpmeth/start.java +++ /dev/null @@ -1,13 +0,0 @@ -package tmpmeth; - -public class start { - - public static void main(String[] args) { - // TODO Auto-generated method stub - Dice d4 = new Dice(4); - Dice d6 = new Dice(6); - - System.out.println(DamageCalculator.calculDamage(d6, d4)); - - } -}