From a4479a21e6facfcd0706eaa195f52ca224681582 Mon Sep 17 00:00:00 2001 From: Noopyx Date: Tue, 24 Feb 2015 15:24:59 +0100 Subject: [PATCH 1/9] Create test --- test | 1 + 1 file changed, 1 insertion(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..a48cf0d --- /dev/null +++ b/test @@ -0,0 +1 @@ +public From b074aea1afc0cbf0f0ff5fec6323dcf250f23e08 Mon Sep 17 00:00:00 2001 From: Noopyx Date: Tue, 24 Feb 2015 15:25:58 +0100 Subject: [PATCH 2/9] Create Robots.java --- Robots.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Robots.java diff --git a/Robots.java b/Robots.java new file mode 100644 index 0000000..1bebdfb --- /dev/null +++ b/Robots.java @@ -0,0 +1,49 @@ + +public class Robots { + protected String affichage; + protected int portee, deplacement, energie, regeneration, degat, coutAttaque, coutDeplacement; + + public Robots (String affich, int po, int dep, int energie, int degat, int coutAtt, int coutDep) { + this.affichage=affich; + this.portee = po; + this.regeneration = 2; + this.deplacement =dep; + this.energie=energie; + this.degat=degat; + this.coutAttaque=coutAtt; + this.coutDeplacement=coutDep; + } + + String getAffich() { + return this.affichage; + } + + int getEnergie() { + return this.energie; + } + + int getPortee() { + return this.portee; + } + + int getDeplacement(){ + return this.deplacement; + } + + int getRegeneration(){ + return this.regeneration; + } + + int getDegat() { + return this.degat; + } + + int getCoutAttaque() { + return this.coutAttaque; + } + + int getCoutDeplacement(){ + return this.coutDeplacement; + } + +} From 42b9e3b126c6d12dc753c629f8615e1492aa96c1 Mon Sep 17 00:00:00 2001 From: Noopyx Date: Tue, 24 Feb 2015 15:26:20 +0100 Subject: [PATCH 3/9] Create Tireur.java --- Tireur.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Tireur.java diff --git a/Tireur.java b/Tireur.java new file mode 100644 index 0000000..0012476 --- /dev/null +++ b/Tireur.java @@ -0,0 +1,7 @@ + +public class Tireur extends Robots { + + public Tireur(String affich, int po, int dep, int energie, int degat, int coutAtt, int coutDep) { + super(affich, po, dep, energie, degat, coutAtt, coutDep); + } +} From 1c15c3375450797e4b9ee86443f3b4a43d5404bb Mon Sep 17 00:00:00 2001 From: Noopyx Date: Tue, 24 Feb 2015 15:26:40 +0100 Subject: [PATCH 4/9] Create main.java --- main.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 main.java diff --git a/main.java b/main.java new file mode 100644 index 0000000..17b50d4 --- /dev/null +++ b/main.java @@ -0,0 +1,10 @@ + +public class main { + + public static void main (String[] args) { + Plateau jeu = new Plateau(); + System.out.println(jeu.toString()); + + } + +} From 7c8dc9d718af95a38ade09831d8c790c728d962a Mon Sep 17 00:00:00 2001 From: Noopyx Date: Tue, 24 Feb 2015 15:27:02 +0100 Subject: [PATCH 5/9] Create Plateau.java --- Plateau.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Plateau.java diff --git a/Plateau.java b/Plateau.java new file mode 100644 index 0000000..8eac66e --- /dev/null +++ b/Plateau.java @@ -0,0 +1,44 @@ +public class Plateau { + private Object[][] tab; + + public Plateau () { + this.tab= new Object[10][15]; + for(int i=0; i Date: Fri, 3 Apr 2015 05:30:59 +0200 Subject: [PATCH 6/9] Update Plateau.java --- Plateau.java | 52 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/Plateau.java b/Plateau.java index 8eac66e..486640a 100644 --- a/Plateau.java +++ b/Plateau.java @@ -1,19 +1,31 @@ + public class Plateau { - private Object[][] tab; - + private Base B = new Base("B"); + private Base b = new Base("b"); + private Object[][] tab; + public Plateau () { this.tab= new Object[10][15]; - for(int i=0; i Date: Fri, 3 Apr 2015 05:34:27 +0200 Subject: [PATCH 7/9] Update Robots.java --- Robots.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Robots.java b/Robots.java index 1bebdfb..dcda03c 100644 --- a/Robots.java +++ b/Robots.java @@ -1,4 +1,3 @@ - public class Robots { protected String affichage; protected int portee, deplacement, energie, regeneration, degat, coutAttaque, coutDeplacement; From 84b1f9cb33fd674fccecf5bf48af81c956862bc9 Mon Sep 17 00:00:00 2001 From: Noopyx Date: Fri, 3 Apr 2015 05:35:21 +0200 Subject: [PATCH 8/9] Update main.java --- main.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/main.java b/main.java index 17b50d4..15510c5 100644 --- a/main.java +++ b/main.java @@ -1,10 +1,16 @@ -public class main { +public class Main { public static void main (String[] args) { Plateau jeu = new Plateau(); - System.out.println(jeu.toString()); - + //System.out.println(jeu.toString()); + Coordonne start = new Coordonne(0,0); + Coordonne goal = new Coordonne(14,9); + PathFinding p = new PathFinding(start,goal); + p.setTab(jeu.getTab()); + System.out.println(p); + p.findPath(); + System.out.println("\n" + p.getPath()); } } From 6510c52ed07beee4edee308fee3b82c58e186f8d Mon Sep 17 00:00:00 2001 From: Noopyx Date: Fri, 3 Apr 2015 05:35:40 +0200 Subject: [PATCH 9/9] Rename main.java to Main.java --- main.java => Main.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename main.java => Main.java (100%) diff --git a/main.java b/Main.java similarity index 100% rename from main.java rename to Main.java