diff --git a/README.md b/README.md
index a8f537823e00b4f032ecac9bf60449990a7f5be2..2dce71f0c84597823fc0fcc930f1debc18c0a9ea 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,46 @@
# project_object
+## part 2
+### what I coded
-## Getting started
+I asked the professor and assistant, and this is the task I was given.
+Code a black jack game where 1 human plays vs the dealer, no cpu or other human player.
+Implement a compareTo method for the hands
+IMplement player interface, use it for dealer and human player
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+### rules I coded
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+I asked the professor and assistant, and this is the rules I was given.
-## Add your files
+actions choices:
+- if a player insures, he cannot double down or split
+- a player starting with a black jack he can insure and double down
+- split and double down are mutually exluciv
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+double down:
+- if a player doubles down, he chooses if he wants 1 more card and then stays
-```
-cd existing_repo
-git remote add origin https://gitedu.hesge.ch/raphael.rampf/project_object.git
-git branch -M main
-git push -uf origin main
-```
+split:
+- hand get splited into two, a card is given to the two resulting hand
+- splited hands from 2 aces can not receive more cards than the one given by the split
+- a splited hand can't black jack
+- max 3 hands per player
-## Integrate with your tools
+hit:
+- a player stops after reaching 21 or upon busting
-- [ ] [Set up project integrations](https://gitedu.hesge.ch/raphael.rampf/project_object/-/settings/integrations)
+wins:
+- bust or loose to dealer, nothing
+- draw, get bet back
+- win, bet x2, if black jack bet x 2,5
+- if insured, inured amount x3
-## Collaborate with your team
+miscelleanous:
+- if rounding amounts of money is necessary, you roud it down
+- whene you reach the card reserve, you finish the table then shuffle back all cards
+- score of 999 means black jack
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+Flowchart I coded :
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+
diff --git a/flowchart.png b/flowchart.png
new file mode 100644
index 0000000000000000000000000000000000000000..944c68e0345d308b7922fb85188063eadbcd46c6
Binary files /dev/null and b/flowchart.png differ
diff --git a/maven-template-jdk17/src/main/java/ch/hepia/App.java b/maven-template-jdk17/src/main/java/ch/hepia/App.java
index 4c8726852e711e030f906277b79699a8aa3a9b19..1e0a98070c2752b3297d931cd4e9d90a037c5d27 100755
--- a/maven-template-jdk17/src/main/java/ch/hepia/App.java
+++ b/maven-template-jdk17/src/main/java/ch/hepia/App.java
@@ -10,6 +10,7 @@ public class App{
public static Scanner scan = new Scanner(System.in);
public static void main(String[] args) {
+ System.out.println("rules I coded in the readme");
System.out.println("Combien d'argent pour le joueur ?");
int input = scan.nextInt();
GameManager game = new GameManager(input, 6, 52);
@@ -20,6 +21,7 @@ public class App{
}
}
}
+
//leagacy code
/* public class App {
public static void affichePaquet(JeuDeCarte[] paquet) {
diff --git a/maven-template-jdk17/src/main/java/ch/hepia/BlackJackHand.java b/maven-template-jdk17/src/main/java/ch/hepia/BlackJackHand.java
index c53b33a147a932dc10f7dc3f7acf56b9083a69c5..dae20a71af1ab2bf102b9ea795c129dd5b69b63d 100644
--- a/maven-template-jdk17/src/main/java/ch/hepia/BlackJackHand.java
+++ b/maven-template-jdk17/src/main/java/ch/hepia/BlackJackHand.java
@@ -7,18 +7,24 @@ public class BlackJackHand extends Hand {
private int bet;
private boolean stayed;
private boolean splited;
+ private boolean aceSplited;
BlackJackHand() {
super();
this.bet = 0;
this.stayed = false;
this.splited = false;
+ this.aceSplited = false;
}
public int getBet() {
return this.bet;
}
+ public boolean getAceSplited(){
+ return this.aceSplited;
+ }
+
public ArrayList<Card> getCards() {
return this.cards;
}
@@ -35,6 +41,10 @@ public class BlackJackHand extends Hand {
this.splited = true;
}
+ public void isAceSplit() {
+ this.aceSplited = true;
+ }
+
public int score() {
int score = 0;
// score normal
diff --git a/maven-template-jdk17/src/main/java/ch/hepia/GameManager.java b/maven-template-jdk17/src/main/java/ch/hepia/GameManager.java
index 8336aceae4a0855106a4d82e460595c14ff120d8..19ffa7d7b8b9e22f4e2e53cb2f861696f2cea664 100644
--- a/maven-template-jdk17/src/main/java/ch/hepia/GameManager.java
+++ b/maven-template-jdk17/src/main/java/ch/hepia/GameManager.java
@@ -76,44 +76,40 @@ public class GameManager {
this.human.printCurrentHand();
System.out.println("score :" + this.human.scoreCurrentHand());
System.out.println("--------------------\n");
- // si black jack on ne peut rien faire
- // assurance, check si assez d'argent
- if (this.human.getMoney() > this.human.getInitialBet() / 2) {
- // si assez + as dealer, propose assurance
- if (this.dealer.getFirstCard().getRank() == 1) {
- askInsurance();
- }
+ // propose assurance si dealer a as et si assez d'argent
+ if (this.dealer.getFirstCard().getRank() == 1 && this.human.getMoney() > this.human.getInitialBet() / 2) {
+ askInsurance();
}
- // ensuite on peut jouer que si on pas un black jack
- if (this.human.scoreCurrentHand() != 999) {
- // regarde si assez d'argent pour doubler
- // si pas assez on ne peut pas split non plus
- // double ? sinon split ? sinon aucun des deux
- if (this.human.getMoney() >= this.human.getInitialBet()) {
- if (!this.human.getInsured()) {
- // propose double down
- this.askDoubleDown();
- if (this.human.getDoubled()) {
- // joue une seul carte sur sa seul main
- this.human.drawForCurrentHand(this.draw());
- } else {
- // joue sur chaque mains
- while (!this.human.getFinishedTurn()) {
- // propose split tant que c'est possible
- while (this.human.canSplitCurrentHand()) {
- this.askSplit();
- }
+ // regarde si assez d'argent pour doubler
+ // si pas assez on ne peut pas split non plus
+ // double ? sinon split ? sinon aucun des deux
+ if (this.human.getMoney() >= this.human.getInitialBet()) {
+ if (!this.human.getInsured()) {
+ // propose double down
+ this.askDoubleDown();
+ if (this.human.getDoubled()) {
+ // decide si il prend un carte en plus
+ this.askCard();
+ } else {
+ // joue sur chaque mains
+ while (!this.human.getFinishedTurn()) {
+ // propose split tant que c'est possible
+ while (this.human.canSplitCurrentHand()) {
+ this.askSplit();
+ }
+ //peux recevoir des cartes que si la main n'est pas split de 2 aces
+ if (!this.human.isCurrentHandAceSplited()) {
// joue la main
humanPlayCurrentHand();
- this.human.nextHand();
}
+ this.human.nextHand();
}
}
- } else {
- // joue une seul main, sans split ou double possible
- humanPlayCurrentHand();
}
+ } else {
+ // joue une seul main, sans split ou double possible
+ humanPlayCurrentHand();
}
// fin du tour et calcul
System.out.println("--------------------\nFin du tour, voici votre/vos mains et scores :");
@@ -285,7 +281,7 @@ public class GameManager {
}
public void endTurn() {
- //reset dealer
+ // reset dealer
dealer.reset();
// check need of new decks
if (this.reserve.size() < 52) {
diff --git a/maven-template-jdk17/src/main/java/ch/hepia/Human.java b/maven-template-jdk17/src/main/java/ch/hepia/Human.java
index 6c9c2a03434789946661d79a40de0e00a760283c..c3a02527dbec2e0b76a0c85d72df13ca74381575 100644
--- a/maven-template-jdk17/src/main/java/ch/hepia/Human.java
+++ b/maven-template-jdk17/src/main/java/ch/hepia/Human.java
@@ -162,6 +162,10 @@ public class Human implements Player {
}
}
+ public boolean isCurrentHandAceSplited(){
+ return this.hands.get(currentHand).getAceSplited();
+ }
+
// ----------------------------------------------------------------------------------------------------------
// game action
@@ -182,6 +186,11 @@ public class Human implements Player {
//indique que les mains sont split
newHand.isSplit();
this.hands.get(this.currentHand).isSplit();
+ //indique si les mains sont split depuis une pair d'as
+ if (this.hands.get(currentHand).cards.get(0).getRank() == 1) {
+ this.hands.get(currentHand).isAceSplit();
+ newHand.isAceSplit();
+ }
// copie la la carte 0 de la main courrante a al nouvelle
Card card = this.hands.get(this.currentHand).cards.get(0);
newHand.addCard(card);
diff --git a/maven-template-jdk17/target/classes/ch/hepia/App.class b/maven-template-jdk17/target/classes/ch/hepia/App.class
index af7301eed55c11b4a28f3ce074f6aa915250c583..2caa64e880800c71ab8aba1a8cb48f1547d993e2 100644
Binary files a/maven-template-jdk17/target/classes/ch/hepia/App.class and b/maven-template-jdk17/target/classes/ch/hepia/App.class differ
diff --git a/maven-template-jdk17/target/classes/ch/hepia/BlackJackHand.class b/maven-template-jdk17/target/classes/ch/hepia/BlackJackHand.class
index b4ce3cb6c04f13530458511eb8bb3d20a764ce1c..42af670b0b15f49ed516259422a4414996ddf54d 100644
Binary files a/maven-template-jdk17/target/classes/ch/hepia/BlackJackHand.class and b/maven-template-jdk17/target/classes/ch/hepia/BlackJackHand.class differ
diff --git a/maven-template-jdk17/target/classes/ch/hepia/Dealer.class b/maven-template-jdk17/target/classes/ch/hepia/Dealer.class
index 28d2f84eb819903411a5592d4d4517128615b232..be20af2f7b6199a456b3d2be607e76b45f969e7a 100644
Binary files a/maven-template-jdk17/target/classes/ch/hepia/Dealer.class and b/maven-template-jdk17/target/classes/ch/hepia/Dealer.class differ
diff --git a/maven-template-jdk17/target/classes/ch/hepia/GameManager.class b/maven-template-jdk17/target/classes/ch/hepia/GameManager.class
index c6772f47492829a56e4cd6b38ee5af9e61ba0334..223d6913fbd9d33291b907bcdbbb9d18d35ac8d3 100644
Binary files a/maven-template-jdk17/target/classes/ch/hepia/GameManager.class and b/maven-template-jdk17/target/classes/ch/hepia/GameManager.class differ
diff --git a/maven-template-jdk17/target/classes/ch/hepia/Human.class b/maven-template-jdk17/target/classes/ch/hepia/Human.class
index d7abd533166860cf1f0b1cff9a4e98b35e67a3fd..1e948435146b0a80524654e7309a716fcb78b270 100644
Binary files a/maven-template-jdk17/target/classes/ch/hepia/Human.class and b/maven-template-jdk17/target/classes/ch/hepia/Human.class differ