Merge branch 'serk'

VaporWaveWars/VaporWaveWars.pro

@@ -11,7 +11,11 @@ SOURCES += main.cpp \
     character.cpp \
     compas.cpp \
     scene.cpp \
-    menu.cpp
+    menu.cpp \
+    combat.cpp \
+    player.cpp \
+    enemy.cpp \
+    iaenemy.cpp
 
 HEADERS += \
     game.hpp \
@@ -21,4 +25,8 @@ HEADERS += \
     character.hpp \
     compas.hpp \
     scene.hpp \
-    menu.hpp
+    menu.hpp \
+    combat.hpp \
+    player.hpp \
+    enemy.hpp \
+    iaenemy.hpp

VaporWaveWars/combat.cpp

@@ -0,0 +1,29 @@
+#include "combat.hpp"
+
+Combat::Combat() {
+    ia = playerOneTurn = true;
+    enemy = new IaEnemy();
+}
+
+Combat::Combat(bool ia) {
+    this->ia = ia;
+    playerOneTurn = true;
+    if (ia) enemy = new IaEnemy();
+    else enemy = new Player();
+}
+
+void Combat::update(float deltaTime, sf::RenderWindow *window) {
+    if (playerOneTurn) player.update(deltaTime, window);
+    else if (ia) playerOneTurn = enemy->update(deltaTime, window);
+}
+
+void Combat::draw(sf::RenderWindow *window) {
+    player.draw(window);
+    enemy->draw(window);
+
+}
+
+void Combat::updateEvents(sf::Event e) {
+    if (playerOneTurn) playerOneTurn = player.event(e);
+    else if (!ia) playerOneTurn = !enemy->event(e);
+}

VaporWaveWars/combat.hpp

@@ -0,0 +1,29 @@
+#ifndef COMBAT_H
+#define COMBAT_H
+
+#include "commons.hpp"
+#include "compas.hpp"
+#include "scene.hpp"
+#include "player.hpp"
+#include "iaenemy.hpp"
+#include "enemy.hpp"
+
+class Combat : public Scene {
+public:
+    Combat();
+    Combat(bool ia);
+    Combat(const Combat& m) = delete;
+    Combat(const Combat&& m) = delete;
+    Combat& operator=(Combat& m) = delete;
+    Combat& operator=(Combat&& m) = delete;
+    void update(float deltaTime, sf::RenderWindow *window) final override;
+    void draw(sf::RenderWindow *window) final override;
+    void updateEvents(sf::Event e) final override;
+private:
+    Compas compas;
+    bool playerOneTurn, ia;
+    Player player;
+    Enemy *enemy;
+};
+
+#endif // COMBAT_H

VaporWaveWars/enemy.cpp

@@ -0,0 +1,7 @@
+#include "enemy.hpp"
+
+Enemy::Enemy() {}
+
+void Enemy::draw(sf::RenderWindow *window) {
+
+}

VaporWaveWars/enemy.hpp

@@ -0,0 +1,17 @@
+#ifndef ENEMY_H
+#define ENEMY_H
+
+#include "commons.hpp"
+
+class Enemy
+{
+public:
+    Enemy();
+    virtual bool update(float deltaTime, sf::RenderWindow *window) = 0;
+    void draw(sf::RenderWindow *window) ;
+    virtual bool event(sf::Event e) = 0;
+protected:
+    bool animate;
+};
+
+#endif // ENEMY_H

VaporWaveWars/iaenemy.cpp

@@ -0,0 +1,10 @@
+#include "iaenemy.hpp"
+
+IaEnemy::IaEnemy() {}
+
+bool IaEnemy::update(float deltaTime, sf::RenderWindow *window) {
+    //some playe return true
+    return true;
+}
+
+bool IaEnemy::event(sf::Event e) {return false;}

VaporWaveWars/iaenemy.hpp

@@ -0,0 +1,13 @@
+#ifndef IAENEMY_H
+#define IAENEMY_H
+
+#include "enemy.hpp"
+
+class IaEnemy : public Enemy {
+public:
+    IaEnemy();
+    bool update(float deltaTime, sf::RenderWindow *window) final override;
+    bool event(sf::Event e) final override;
+};
+
+#endif // IAENEMY_H

VaporWaveWars/player.cpp

@@ -0,0 +1,31 @@
+#include "player.hpp"
+
+Player::Player() {
+    animate = false;
+}
+
+bool Player::update(float deltaTime, sf::RenderWindow *window) {
+    if (deltaTime > BLACKVALUE) compas.incraeseTime();
+    return false;
+}
+
+bool Player::event(sf::Event e) {
+    switch(e.type) {
+    case (sf::Event::KeyPressed):
+        if(e.key.code == sf::Keyboard::C) compas.start();
+        if(e.key.code == sf::Keyboard::Space) {
+            compas.add();
+            animate = true;
+        }
+    break;
+    case (sf::Event::KeyReleased):
+        if (e.key.code == sf::Keyboard::C) {
+            compas.end();
+            return false;
+        }
+    break;
+    default:
+    break;
+    }
+    return true;
+}

VaporWaveWars/player.hpp

@@ -0,0 +1,16 @@
+#ifndef PLAYER_H
+#define PLAYER_H
+
+#include "commons.hpp"
+#include "compas.hpp"
+#include "enemy.hpp"
+class Player : public Enemy {
+public:
+    Player();
+    bool update(float deltaTime, sf::RenderWindow *window) final override;
+    bool event(sf::Event e) final override;
+private:
+    Compas compas;
+};
+
+#endif // PLAYER_H

VaporWaveWars/scene.hpp

@@ -10,7 +10,7 @@ class Scene
         virtual ~Scene();
         virtual void update(float deltaTime, sf::RenderWindow *window) = 0;
         virtual void draw(sf::RenderWindow *window) = 0;
-        virtual void updateEvents(sf::Event) = 0;
+        virtual void updateEvents(sf::Event e) = 0;
     protected:
         Game* parent;
 };