Version-2-Détaillée.md

@@ -122,152 +122,288 @@ Quand le joueur perds tout ces pokemons, il se retrouve face à l'écran de Game
 left to right direction
 
 class Game {
+    - Model *model
+    - GUI *gui
     - Player *player
-    - QTimer *waitFight
+    - Battle *battle
+    - Pokemon *selectedNewPokemon
     + Game(Model *model, GUI *gui, QWidget *parent = nullptr)
     + ~Game()
-    + <<slots>> updateView(): void
-    + <<slots>> showFight(): void
-    + <<slots>> fight(): void
-    + <<slots>> continuefight(): void
-    # keyPresEvent(QKeyEvent * event): void
+    + setScene(QGraphicsScene *scene): void
+    + changePokemon(Pokemon *pokemon): void
+    + updateView(): void
+    + showFight(): void
+    + showBossFight(): void
+    + showOldMenSpeach(): void
+    + continuefight(): void
+    + endFight(bool playerWon): void
+    + run(): void
+    + generateNewOpponent(): void
+    + showMoves(): void
+    + switchPokemon(): void
+    + onMoveButtonClicked(QAbstractButton *moveButton): void
+    + showFightMenu(): void
+    + offerPokemonSwitch(): void
+    + onNewPokemonSelected(Pokemon* newPokemon): void
+    + onOldPokemonSelected(Pokemon* oldPokemon): void
+    # keyPressEvent(QKeyEvent * event): void
     # mousePressEvent(QMouseEvent *event): void
     # mouseDoubleClickEvent(QMouseEvent *event): void
-    
+    # focusOutEvent(QFocusEvent *event): void
+    # focusInEvent(QFocusEvent *event): void
 }
 
 class Player {
     - scale: float  
-    - *movementTimer: QTimer
-    - currentKey: int
-    - checkCollision(QPointF newPos): bool
+    - QTimer *movementTimer
+    - std::vector<Pokemon*> itsTeam
+    - QSet<int> activeKeys
+    - float itsLevel
+    - int winCount
     + Player(QGraphicsItem *parent = nullptr)
     + ~Player()
-    + getTeam(): vector<Pokemon*>
+    + getTeam() const: std::vector<Pokemon*>
+    + setTeam(vector<Pokemon*>): void
     + keyPressEvent(QKayEvent *event): void
-    # keyReleaseEvent(QKeyEvent *event): void
-    + «slot» move(): void
-    - startMoving(int key): void
     + stopMoving(): void
+    + addPokemon(Pokemon *pokemon): void
+    + removePokemon(Pokemon *pokemon): void
+    + incrementWinCount(): void
+    + float getItsLevel() const: float
+    + setItsLevel(float newItsLevel): void
+    + int getWinCount() const: int
+    + setWinCount(int newWinCount): void
+    - checkCollision(QPointF newPos): bool
+    - startMoving(): void
+    - updateSprite(const QString &direction): void
+    + «slot» move(): void
     + «signal» startEncounterCombat(): void
+    + «signal» startEncouterBoss(): void
+    + «signal» startEncouterOldMen(): void
 }
 
-
 class Pokemon {
-    - id_pk: int
-    - itsName: String
-    - itsType: PKTYPE
-    - itsHealth: int
-    - itsMaxHealth: int
-    - itsSpeed: int
-    - itsAtk: int
-    - itsSpAtk: int
-    - itsDef: int
-    - itsSpDef: int
-    - itsLevel: int
+    - int id_pk
+    - string itsName
+    - PKTYPE itsType
+    - int itsHealth
+    - int itsMaxHealth
+    - int itsSpeed
+    - int itsAtk
+    - int itsSpAtk
+    - int itsDef
+    - int itsSpDef
+    - int itsLevel
+    - QList<Move*> itsMoves
     + Pokemon(int id_pk, string itsName, PKTYPE itsType, int itsHealth, int itsSpeed, int itsAtk, int itsSpAtk, int itsDef, int itsSpDef, int itsLevel)
-    + ~Pokemon()
     + isDead(Pokemon &target): bool
-    + takeDamage(: intint damage)
-    + attack(Pokemomn &target, Move move): void
-    + getLvl() const: int
-    + getHealth() const: int 
-    + getItsMaxHealth() const: int
-    + getSpeed() const: int
-    + getAtk() const: int 
-    + getSpAtk() const: int
-    + getDef() const: int
-    + getSpDef() const: int
-    + getId() const: int
-    + getItsName() const: string
-    + getItsMoves() const: QList<Move> 
-    + setItsMoves(const QList<Move> &newItsMoves): void
-}
-
-enum PKTYPE {
-Plante
-Feu
-Eau
-Electrique
-Glace
-Vol
-}
-
-enum MOVENATURE {
-Physical
-Special
+    + takeDamage(int damage): void
+    + int getId() const: int
+    + int getLvl() const: int
+    + int getHealth() const: int
+    + int getSpeed() const: int
+    + int getAtk() const: int
+    + int getSpAtk() const: int
+    + int getDef() const: int
+    + int getSpDef() const: int
+    + string getItsName() const: string
+    + int getItsMaxHealth() const: int
+    + QList<Move*> getItsMoves() const: QList<Move*>
+    + void setItsMoves(const QList<Move*> &newItsMoves): void
+    + PKTYPE getItsType() const: PKTYPE
 }
 
 class Move {
-    - itsName: string
-    - itsPower: int
-    - itsAccuracy: int
-    - itsType: MOVENATURE
-    + Move(string itsName, int itsPower, int itsAccuracy, MOVENATURE itsType)
+    - string itsName
+    - int itsPower
+    - int itsAccuracy
+    - MOVENATURE itsNature
+    - PKTYPE itsType
+    + Move(string itsName, int itsPower, int itsAccuracy, MOVENATURE itsNature, PKTYPE itsType)
     + getItsName() const: string
     + getItsPower() const: int
     + getItsAccuracy() const: int
+    + getItsNature() const: MOVENATURE
+    + getItsType() const: PKTYPE
     + calculateDamage(int lvl, int atk, int def, bool crit) const: int
-    + getItsType() const: MOVENATURE
+    + string getItsTextType(int type) const: string
 }
 
 class Battle {
-    + Battle(Player *itsPlayer1, Pokemon *opponent1, BattleHUD *battleHUD1)
+    - Pokemon *itsOpponent1
+    - Pokemon *itsOpponent2
+    - BattleHUD *itsBattleHUD1
+    - std::mt19937 gen
+    - std::vector<Pokemon*> itsBossTeam
+    + Battle(Pokemon *opponent1, Pokemon *opponent2, BattleHUD *battleHUD1)
+    + ~Battle()
     + attack(Move *move, Pokemon *target): void
+    + std::vector<Pokemon*> getBossTeam() const: std::vector<Pokemon*>
+    + void setBossTeam(std::vector<Pokemon*> team): void
+    + BattleHUD* getBattleHUD(): BattleHUD*
 }
 
 class BattleHUD {
+    - QPushButton *attackButton
+    - QPushButton *pokemonButton
+    - QPushButton *runButton
+    - Pokemon *pokemon1
+    - Pokemon *pokemon2
+    - QGraphicsPixmapItem *pokemon1Item
+    - QGraphicsPixmapItem *pokemon2Item
+    - QGraphicsPixmapItem *bossItem
+    - QGraphicsTextItem *health1
+    - QGraphicsTextItem *health2
+    - QGraphicsTextItem *menuText
+    - QGraphicsTextItem *attackText
+    - QGraphicsPixmapItem *dialogueBox
+    - QButtonGroup *moveButtonsGroup
+    - QPushButton *backButton
     + BattleHUD(QObject *parent = nullptr)
-    + *getAttackButton(): QPushButton
+    + ~BattleHUD()
+    + getAttackButton(): QPushButton*
+    + getPokemonButton(): QPushButton*
+    + getRunButton(): QPushButton*
     + setPokemon(Pokemon *pk1, Pokemon *pk2): void
-    - *attackButton: QPushButton           
-    - *pokemon1: Pokemon                  
-    - *pokemon2: Pokemon                
-    - *pokemon1Item: QGraphicsPixmapItem 
-    - *pokemon2Item: QGraphicsPixmapItem   
-    - *health1: QGraphicsTextItem         
-    - *health2: QGraphicsTextItem 
+    + shakePokemon(Pokemon *pk): void
+    + frontDashPokemon(Pokemon *pk): void
+    + Pokemon* getPokemon1() const: Pokemon*
+    + Pokemon* getPokemon2() const: Pokemon*
+    + displayMoves(): void
+    + menuFight(): void
+    + QButtonGroup* getMoveGroup() const: QButtonGroup*
+    + QPushButton* getBackButton() const: QPushButton*
+    + setText(QString text): void
 }
 
 class Data {
-    - db: QSqlDatabase
+    - QSqlDatabase db
     + Data()
     + ~Data()
-    + *randompokemon(): Pokemon
-    + getMoves(int pokemon_id): QList<Move>
+    + Pokemon* randompokemon()
+    + QList<Move*> getMoves(int pokemon_id)
+    + QSqlDatabase getDb()
 }
 
 class GameOverHUD {
-    + gameOverHUD(QObject *parent = nullptr)
+    + GameOverHUD(QObject *parent = nullptr)
 }
 
 class Gui {
+     - Model *model
+     - GameOverHUD *gameOverHUD
+     - MapHUD *mapHUD
+     - MainHUD *mainHUD
+     - BattleHUD *battleHUD
+     - PlayerHUD *playerHUD
      + GUI(Model *model)
-     + *mainMenu(): MainHUD
-     + *gameOver(): gameOverHUD
-     + *map(): MapHUD
-     + *battle(Pokemon *pk1, Pokemon *pk2): BattlHUD
-     + *battle(): BattlHUD
+     + ~GUI()
+     + MainHUD* mainMenu(): MainHUD*
+     + GameOverHUD* gameOver(): GameOverHUD*
+     + MapHUD* map(): MapHUD*
+     + BattleHUD* battle(Pokemon *pk1, Pokemon *pk2): BattleHUD*
+     + BattleHUD* battle(): BattleHUD*
+     + PlayerHUD* playerTeam(vector<Pokemon *> pokemons, int itsLevel): PlayerHUD*
+     + PlayerHUD* team(): PlayerHUD*
+     + PlayerHUD* selectPokemon(vector<Pokemon *> pokemons): PlayerHUD*
 }
 
 class MainHUD {
      + MainHUD(QObject *parent = nullptr)
+     + displayMainMenu(): void
 }
 
 class MapHUD {
+    - Model *model
+    - Player *player
+    - std::mt19937 gen
+    - std::uniform_int_distribution<> encounterDist
+    - QGraphicsPixmapItem *bossItem
+    - QGraphicsPixmapItem *oldMenItem
      + MapHUD(Model *model, QObject *parent = nullptr)
      + ~MapHUD()
      + drawMap(): void
+     + Player* getPlayer(): Player*
+     - drawGrassLayer(const std::vector<std::vector<int>>& map): void
+     - drawDecorativeElements(const std::vector<std::vector<int>>& map): void
+     - initializePlayer(): void
+     - handleTileInteraction(int tileType): void
+     - handleRandomEncounter(): void
      # keyPressEvent(QKeyEvent *event): void
-     + *getPlayer(): Player
+     - enteringBoat(Player *player, const std::string &direction): void
+     - enteringBossZone(Player *player): void
+     - enteringOldMenZone(Player *player): void
 }
 
 class Model {
-     - map: std::vector<std::vector<char>>
+    - std::vector<std::vector<int>> map
+    - Data *data
     + Model()
+    + ~Model()
     + loadMap(const QString& filename): void
-     + getMap() const: const vector<vector<char>>&
-     + *getData(): Data
+    + const std::vector<std::vector<int>>& getMap() const: const std::vector<std::vector<int>>&
+    + Data* getData(): Data*
+    + const vector<Pokemon*>& getFirstTeam() const: const vector<Pokemon*>&
+}
+
+class PlayerHUD {
+    - std::vector<Pokemon*> pokemons
+    - QList<QGraphicsPixmapItem*> characterItems
+    - QList<QGraphicsTextItem*> healthTextItems
+    - QList<QGraphicsProxyWidget*> healthBars
+    - QGraphicsPixmapItem *selectionArrow
+    - QGraphicsTextItem *pokemonLabel
+    - bool selectionMode
+    - int selectedIndex
+    - int itsLevelPlayer
+    + PlayerHUD(QObject *parent = nullptr)
+    + setPokemons(const std::vector<Pokemon*>& pokemons, int itsLevelPlayer): void
+    + setSelectionMode(bool selectionMode): void
+    + updateHUD(): void
+    + QGraphicsTextItem* getPokemonLabel() const: QGraphicsTextItem*
+    + setPokemonLabel(QGraphicsTextItem *newPokemonLabel): void
+    # keyPressEvent(QKeyEvent *event): void
+    - addCharacter(const QPixmap &characterImage, int currentHealth, int maxHealth, int xPos, int yPos): void
+    - updateSelectionArrow(): void
+    + «signal» pokemonSelected(Pokemon *pokemon): void
+}
+
+class PKTYPE {
+    + PKTYPE()
+}
+
+class HoverButton : public QPushButton {
+    - QIcon normalIcon
+    - QIcon hoverIcon
+    + HoverButton(const QPixmap &normalIconPath, const QPixmap &hoverIconPath, QWidget *parent = nullptr)
+    + void enterEvent(QEnterEvent *event): void
+    + void leaveEvent(QEvent *event): void
+}
+
+enum PKTYPE {
+    Grass,
+    Poison,
+    Normal,
+    Bug,
+    Psychic,
+    Ghost,
+    Ground,
+    Dragon,
+    Fairy,
+    Fire,
+    Fighting,
+    Dark,
+    Electric,
+    Flying,
+    Rock,
+    Steel,
+    Water,
+    Ice
+}
+
+enum MOVENATURE {
+    Physical,
+    Special
 }
 
 Battle --> Player: *itsPlayer1
@@ -326,5 +462,4 @@ Player -up-> Pokemon: - itsTeam vector<Pokemon*>
 Pokemon -down-> Move: - itsMoves QList<Move>
 Pokemon -down-> PKTYPE
 Pokemon -down-> QList
-
 ```
\ No newline at end of file