-
Notifications
You must be signed in to change notification settings - Fork 0
ajout variantes #30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: dev
Are you sure you want to change the base?
ajout variantes #30
Conversation
Hypocrate-code
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dans l'ensemble super, quelques ptites modifs à faire
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
juste faire belek à pas inclure le cmakelists mais oklm
| QComboBox* dificultyComboBox; | ||
|
|
||
|
|
||
| QVBoxLayout* variantesLayout; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
|
|
||
| } | ||
| // calcul points jardins : +1 pt pour chaque jardin | ||
| if (h->getCouleur() == Couleur::Vert) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ajouter algo détection de lac pour les quartier vert
J'ai déjà traité un problème similaire pour l'ajout des hexagones fantomes, n'hésite pas si tu n'as pas d'idée de comment le faire
src/Cite.cpp
Outdated
| if(variantes[2]==1) var = niveau; | ||
| if (cond) | ||
| points_violet += 1 * niveau; | ||
| points_violet += 1 * niveau * var; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
si var = niveau, alors ça ajoute à points_violet niveau², au lieu de 2*niveau
Aussi, cond correspond à la condition pour gagner des points des temples, mais pas de la condition supplémentaire pour doubler les points s'il est sur un niveau supérieur
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes faut que
if(variantes[2]==1){
if(niveau != 1 ) var = 2 ;
}
if (cond) points_violet +=1 * niveau * var
| var = 2; | ||
| } | ||
| } | ||
| if (cond) points_rouge += 1 * niveau * var; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
carré
| points_bleu = *std::max_element(points_hab.begin(), points_hab.end()); | ||
| if(variantes[3]==1){ | ||
| if(points_bleu>=10){ | ||
| points_bleu=points_bleu*2; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍🏻
.qtcreator/CMakeLists.txt.user
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A ne pas ajouter
No description provided.