Merge branch 'master' of https://github.com/Omnipotent-Youth/BombingAdventure_central

Author: L-kcirtaP

BombingAdventure/CMakeLists.txt

@@ -162,12 +162,11 @@ set(GAME_SRC
         Classes/RulesScene.cpp
         Classes/Entity.cpp
         Classes/Player.cpp
-#        Classes/test_moving_scene.cpp
-#        Classes/Monster.cpp
-#        Classes/MonsterController.cpp
+        Classes/Monster.cpp
+        Classes/MonsterController.cpp
         Classes/Item.cpp
         Classes/Bomb.cpp
-        )
+        Classes/ItemController.cpp)
 
 
 set(GAME_HEADERS
@@ -178,12 +177,11 @@ set(GAME_HEADERS
         Classes/RulesScene.h
         Classes/Entity.h
         Classes/Player.h
-#        Classes/test_moving_scene.h
-#        Classes/Monster.h
-#        Classes/MonsterController.h
+        Classes/Monster.h
+        Classes/MonsterController.h
         Classes/Item.h
         Classes/Bomb.h
-        )
+        Classes/ItemController.h)
 
 # add the executable
 if(ANDROID)

BombingAdventure/Classes/Entity.cpp

@@ -18,14 +18,21 @@ Sprite* Entity::get_sprite() {
 void Entity::bind_sprite(Sprite *sprite) {
     this->entity_sprite = sprite;
     this->addChild(entity_sprite);
+
+    /* Reset the content size and fit the mid-points    */
+
+        Size entity_size = entity_sprite->getContentSize();
+        entity_sprite->setAnchorPoint(Vec2(0.5,0.5));
+        this->setAnchorPoint(Vec2(0.5, 0.5));
+        entity_sprite->setPosition(Vec2(entity_size.width * 0.5f, entity_size.height * 0.5f));
+        this->setContentSize(entity_size);
+
 }
-const Size& Entity::getContentSize() {
-    if (get_sprite() == NULL) {
-        return ENTITY_DEFAULT_SIZE;
+void Entity::reset_position() {
+    if(get_sprite() != NULL) {
+        setPosition(Vec2(CCRANDOM_0_1() * 960, CCRANDOM_0_1() * 640));
     }
-    return this->get_sprite()->getContentSize();
 }
-
 Vec2 Entity::tileCoordFromPosition(Vec2 position)
 {
 	int x = position.x / TILE_SIZE.width;

BombingAdventure/Classes/Entity.h

@@ -17,15 +17,7 @@ class Entity : public Node {
     ~Entity();
     Sprite* get_sprite();                   /* Get the sprite of this entity        */
     void bind_sprite(Sprite* sprite);       /* Bind to sprite object                */
-    Point get_position();                   /* Return the position of this entity   */
-
-    /* Method Overriding: getContentSize
-     * Usage: Size size = Entity->getContentSize();
-     * -------------------------------------------------------
-     * Get the size of the Entity, which equals to its sprite.
-     */
-    virtual const Size & getContentSize();
-
+    virtual void reset_position();          /* Reset the position of this entity    */
 	cocos2d::Vec2 tileCoordFromPosition(cocos2d::Vec2 position);
 
 private:

BombingAdventure/Classes/GameScene.cpp

@@ -149,6 +149,13 @@ bool GameScene::init() {
     /* Enable update function of the GameScene, which controls the refreshments */
     this->scheduleUpdate();
 
+    /* Initialize a MonsterController   */
+    MonsterController * monster_controller = MonsterController::create();
+    this->addChild(monster_controller,499);
+
+    /* Initialize an ItemController     */
+    ItemController * item_controller = ItemController::create();
+    this->addChild(item_controller,498);
 	return true;
 }
 
@@ -183,7 +190,6 @@ void GameScene::update(float delta) {
     if (item_position == hero_position) {
         hero->pick_item(*speed_up_item);
     }
-
 }
 
 void GameScene::bomb_explode(Bomb *bomb)

BombingAdventure/Classes/GameScene.h

@@ -3,10 +3,10 @@
 
 #include "cocos2d.h"
 #include "Player.h"
-
-#include "Bomb.h"
+#include "MonsterController.h"
+#include "Monster.h"
+#include "ItemController.h"
 #include "Item.h"
-//#include "Monster.h"
 
 const cocos2d::Size TILE_SIZE(40, 40);
 const cocos2d::Size MAP_SIZE(24, 16);
@@ -76,7 +76,7 @@ class GameScene : public cocos2d::Layer
 	 *      |     |     |     |     |
 	 *      |     |     |     |	    |
 	 *      *-----*-----*-----*-----*
-	 *      |	
+	 *      |
 	 *      |
 	 *      v
 	 *		y-axis (tile)
@@ -110,8 +110,7 @@ class GameScene : public cocos2d::Layer
 //    Monster * monster3;
 
 	/* Test class Player part   */
-    Player * hero;      /* This is the player control by human  */
-
+    Player * hero = NULL;      /* This is the player control by human  */
 //    Map<Vec2, STATUS_AT*> status_map;
 
 };

BombingAdventure/Classes/ItemController.cpp

@@ -0,0 +1,33 @@
+//
+// Created by Brando Zhang on 2018/5/19.
+//
+
+#include "ItemController.h"
+
+bool ItemController::init() {
+    /* Get current time to initialize a random seed     */
+    timeval now;
+    gettimeofday(&now, NULL);
+    auto seed = (unsigned) (now.tv_sec * 1000 + now.tv_usec / 1000);
+    srand(seed);
+
+    create_item();
+    /* Enable update    */
+    this->scheduleUpdate();
+    return true;
+}
+void ItemController::update(float delta) {
+
+}
+void ItemController::create_item() {
+    for (int i = 0; i < NUM_ITEMS; i++) {
+
+        /* Create NUM_ITEMS items */
+        Item * item = Item::create();
+        item->reset_position();
+
+        /* Make the item under the control of ItemController  */
+        this->addChild(item);
+        current_item_vector.pushBack(item);
+    }
+}

BombingAdventure/Classes/ItemController.h

@@ -0,0 +1,35 @@
+//
+// Created by Brando Zhang on 2018/5/19.
+//
+
+#ifndef BOMBING_ADVENTURE_ITEMCONTROLLER_H
+#define BOMBING_ADVENTURE_ITEMCONTROLLER_H
+
+#include "cocos2d.h"
+#include "Item.h"
+
+USING_NS_CC;
+
+/* Following are the attributes of Item Controller   */
+const int NUM_ITEMS = 5;
+
+class ItemController : public Node {
+public:
+    CREATE_FUNC(ItemController);
+    /* Initiate Method  */
+    virtual bool init();
+
+    /* Override update method   */
+    virtual void update(float delta);
+private:
+    /* Method: create_item
+     * ----------------------
+     * Create an item
+     */
+    void create_item();
+
+    /* Store all the Items   */
+    Vector<Item*> current_item_vector;
+};
+
+#endif //BOMBING_ADVENTURE_ITEMCONTROLLER_H

BombingAdventure/Classes/Monster.cpp

@@ -0,0 +1,36 @@
+//
+// Created by Brando Zhang on 2018/5/16.
+//
+#include "Monster.h"
+
+Monster::Monster() {
+    /* Avoid inheriting unnecessary children from superclass    */
+    this->removeAllChildren();
+
+    /* Default attributes of a new monster   */
+    HP = MONSTER_DEFAULT_HP;
+    moving_speed = MONSTER_DEFAULT_MOVING_SPEED;
+    num_max_available_bombs = MONSTER_DEFAULT_AVAILABLE_BOMBS;
+    num_present_bombs = 0;
+
+    /* Default view of a new monster         */
+    bind_sprite(Sprite::create("stone_monster.png"));
+    this->setAnchorPoint(Vec2(0.5,0.5));
+}
+Monster::~Monster() {
+    /* Not yet  */
+}
+bool Monster::init() {
+    return true;
+}
+int Monster::get_new_direction() {
+    int new_direction = floor(CCRANDOM_0_1() * 4);
+    return new_direction;
+}
+//void Monster::move_forward(int new_direction) {
+//    step = CCRANDOM_0_1() * 100;
+//    switch (new_direction) {
+//        case MOVE_UP:
+//
+//    }
+//}

BombingAdventure/Classes/Monster.h

@@ -0,0 +1,41 @@
+//
+// Created by Brando Zhang on 2018/5/16.
+//
+
+#ifndef BOMBING_ADVENTURE_MONSTER_H
+#define BOMBING_ADVENTURE_MONSTER_H
+
+#include "cocos2d.h"
+#include "Player.h"
+
+USING_NS_CC;
+//enum direction { MOVE_UP, MOVE_DOWN, MOVE_LEFT, MOVE_RIGHT };
+
+/* Following are the attributes of Monster   */
+const int MONSTER_DEFAULT_HP = 2;
+const int MONSTER_DEFAULT_AVAILABLE_BOMBS = 10;
+const float MONSTER_DEFAULT_MOVING_SPEED = 8.0f;
+
+class Monster : public Player {
+public:
+    /* Constructor  */
+    Monster();
+    /* Destructor   */
+    ~Monster();
+
+    CREATE_FUNC(Monster);
+
+    /* Initiate Method  */
+    virtual bool init();
+
+    /* Method: get_new_direction */
+    int get_new_direction();
+    /* Method: move_forward  */
+//    void move_forward(int new_direction);
+
+private:
+    enum direction { MOVE_UP, MOVE_DOWN, MOVE_LEFT, MOVE_RIGHT };
+
+};
+
+#endif //BOMBING_ADVENTURE_MONSTER_H

BombingAdventure/Classes/MonsterController.cpp

@@ -0,0 +1,42 @@
+//
+// Created by Brando Zhang on 2018/5/16.
+//
+
+#include "MonsterController.h"
+
+bool MonsterController::init() {
+    /* Get current time to initialize a random seed     */
+    timeval now;
+    gettimeofday(&now, NULL);
+    auto seed = (unsigned) (now.tv_sec * 1000 + now.tv_usec / 1000);
+    srand(seed);
+
+    create_monster();
+    /* Enable update    */
+    this->scheduleUpdate();
+    return true;
+}
+void MonsterController::update(float delta) {
+    for (Monster* monster: current_monster_vector) {
+        if (monster->is_alive()) {
+            Vec2 monster_pos_in_pixel = monster->getPosition();
+            Vec2 monster_pos_in_tile = monster->tileCoordFromPosition(monster_pos_in_pixel);
+        if (monster_pos_in_tile.x < 0 || monster_pos_in_tile.x > 40
+                || monster_pos_in_tile.y < 0 || monster_pos_in_tile.y > 40) {
+            monster->reset_position();
+        }
+        }
+    }
+}
+void MonsterController::create_monster() {
+    for (int i = 0; i < NUM_MONSTERS; i++) {
+
+        /* Create NUM_MONSTERS monsters */
+        Monster * monster = Monster::create();
+        monster->reset_position();
+
+        /* Make the monster under the control of MonsterController  */
+        this->addChild(monster);
+        current_monster_vector.pushBack(monster);
+    }
+}