omegalulfruit added

mindoodoo · Apr 10, 2022 · a9e2e8b · a9e2e8b
1 parent 9f29022
commit a9e2e8b
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 8 deletions.
diff --git a/src/games/nibbler/Makefile b/src/games/nibbler/Makefile
@@ -20,6 +20,7 @@ SRC = 	src/GameCore.cpp \
 		src/Player.cpp \
 		src/Terrain.cpp \
 		src/Fruit.cpp \
+		src/MegaFruit.cpp \
 		src/Item.cpp \
 		src/make.cpp \
 		../../shared/mapParser.cpp \

diff --git a/src/games/nibbler/src/Fruit.cpp b/src/games/nibbler/src/Fruit.cpp
@@ -7,14 +7,14 @@
 
 #include "Fruit.hpp"
 #include "Player.hpp"
-#include "../include/NibblerMacros.hpp"
 
 Nibbler::Fruit::Fruit(int x, int y, IGraphicsLib **gfx)
     : Item(x, y, ITEM_FRUIT1, gfx)
 {
 }
 
-void Nibbler::Fruit::effect(Player *nibbler)
+void Nibbler::Fruit::effect(Player *nibbler, int *score)
 {
     nibbler->appendSegment();
+    *score = *score + 1;
 }
diff --git a/src/games/nibbler/src/Fruit.hpp b/src/games/nibbler/src/Fruit.hpp
@@ -19,6 +19,6 @@ namespace Nibbler
         public:
             Fruit(int x, int y, IGraphicsLib **gfx);
 
-            void effect(Player *nibbler) override;
+            void effect(Player *nibbler, int *score) override;
     };
 }
diff --git a/src/games/nibbler/src/Item.hpp b/src/games/nibbler/src/Item.hpp
@@ -9,6 +9,7 @@
 
 #include <utility>
 #include "../../../shared/IGraphicsLib.hpp"
+#include "../include/NibblerMacros.hpp"
 
 namespace Nibbler {
     class Player;
@@ -24,7 +25,7 @@ namespace Nibbler {
 
             bool itemCollision(int x, int y) const;
 
-            virtual void effect(Player *nibbler) = 0;
+            virtual void effect(Player *nibbler, int *score) = 0;
 
             void relocate(int x, int y);
 

diff --git a/src/games/nibbler/src/Level.cpp b/src/games/nibbler/src/Level.cpp
@@ -7,6 +7,7 @@
 
 
 #include "Level.hpp"
+#include "MegaFruit.hpp"
 
 Nibbler::Level::Level(IGraphicsLib **gfx, size_t level)
 {
@@ -28,7 +29,8 @@ Nibbler::Level::Level(IGraphicsLib **gfx, size_t level)
 
     this->_state = LEVEL::RUNNING;
 
-    this->generateItems(ITEM_FRUIT1, this->_gameHeight * this->_gameWidth * 0.1);
+    this->generateItems(ITEM_FRUIT1, this->_gameHeight * this->_gameWidth * 0.05);
+    this->generateItems(ITEM_FRUIT2, this->_gameHeight * this->_gameWidth * 0.02);
 }
 
 void Nibbler::Level::draw()
@@ -83,10 +85,9 @@ void Nibbler::Level::checkItemCollision()
 
     for (Item *item: this->_items) {
         if (item->itemCollision(head.x, head.y)) {
-            item->effect(this->_nibbler);
+            item->effect(this->_nibbler, &this->_score);
             std::pair<int, int> coords = this->randomLocation();
             item->relocate(coords.first, coords.second);
-            this->_score++;
             break;
         }
     }
@@ -101,6 +102,12 @@ void Nibbler::Level::generateItems(int item_id, size_t amount)
         switch (item_id) {
             case ITEM_FRUIT1:
                 item = new Fruit(coords.first, coords.second, this->_gfx);
+                break;
+            case ITEM_FRUIT2:
+                item = new MegaFruit(coords.first, coords.second, this->_gfx);
+                break;
+            default:
+                break;
         }
 
         this->_items.push_back(item);

diff --git a/src/games/nibbler/src/MegaFruit.cpp b/src/games/nibbler/src/MegaFruit.cpp
@@ -0,0 +1,20 @@
+/*
+** EPITECH PROJECT, 2022
+** Project
+** File description:
+** Description
+*/
+
+#include "MegaFruit.hpp"
+#include "Player.hpp"
+
+Nibbler::MegaFruit::MegaFruit(int x, int y, IGraphicsLib **gfx)
+    : Item(x, y, ITEM_FRUIT2, gfx)
+{
+}
+
+void Nibbler::MegaFruit::effect(Nibbler::Player *nibbler, int *score)
+{
+    nibbler->popSegment();
+    *score = *score + 2;
+}
diff --git a/src/games/nibbler/src/MegaFruit.hpp b/src/games/nibbler/src/MegaFruit.hpp
@@ -0,0 +1,23 @@
+/*
+** EPITECH PROJECT, 2022
+** Project
+** File description:
+** Description
+*/
+
+#pragma once
+
+#include "Item.hpp"
+
+namespace Nibbler
+{
+    class Player;
+
+    class MegaFruit : virtual public Item
+    {
+        public:
+            MegaFruit(int x, int y, IGraphicsLib **gfx);
+
+            void effect(Player *nibbler, int *score) override;
+    };
+}
diff --git a/src/games/nibbler/src/Player.cpp b/src/games/nibbler/src/Player.cpp
@@ -27,6 +27,12 @@ void Nibbler::Player::appendSegment()
     this->_body.push_back({.x = this->_pastTile.x, .y = this->_pastTile.y});
 }
 
+void Nibbler::Player::popSegment()
+{
+    if (this->_body.size() > 1)
+        this->_body.pop_front();
+}
+
 void Nibbler::Player::turn(int xOffset, int yOffset)
 {
     if (!(xOffset == 0 || yOffset == 0)) {

diff --git a/src/games/nibbler/src/Player.hpp b/src/games/nibbler/src/Player.hpp
@@ -15,7 +15,8 @@
 
 namespace Nibbler
 {
-    typedef struct {
+    typedef struct
+    {
         int x;
         int y;
     } segment_t;
@@ -29,6 +30,8 @@ namespace Nibbler
 
             void appendSegment();
 
+            void popSegment();
+
             void turn(int xOffset, int yOffset);
 
             int moveForward();
@@ -38,7 +41,9 @@ namespace Nibbler
             segment_t tail();
 
             int getTileOrientation(int bodyIndex) const;
+
             int getCornerOrientation(int bodyIndex) const;
+
             void draw();
 
             bool nibblerCollision(int x, int y);