Beta2 to main (#53)

Author: TheLime1

assets/audio/congratulation.mp3

@@ -0,0 +1,26 @@
+1_What_was_the_source_of_wealth_in_Carthage?_:
+.Agriculture_;    
+.Trade_;    
+.Mining_;   
+.no_idea_; 
+2_Who_was_the_most_famous_Ottoman_Sultan_?_:
+.Suleiman_;    
+.Mehmed_;    
+.Osman_I_;   
+.no_idea_; 
+3_When_did_Tunisia_Gain_the_independence_?_:
+.1952_;   
+.1956_;   
+.1962_;   
+.no_idea_; 
+4_What_was_the_language_of_Islamic_Empire_?_:
+.Turkish_;    
+.Persian_;   
+.Arabic_;   
+.no_idea_; 
+5_Who_was_the_founder_of_Carthage_?_:
+._Hannibal_;   
+._Dido_;   
+._Mago_;   
+.no_idea_;
+	

assets/audio/wrong.mp3

@@ -0,0 +1 @@
+140

assets/font/Skatchboard.ttf

@@ -1,7 +1,7 @@
 CC = gcc
 CFLAGS = -Wall -I../include
 LDFLAGS = -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf
-OBJS = main.o menu.o music.o text.o stars.o settings.o start.o enemy.o
+OBJS = main.o menu.o music.o text.o stars.o settings.o start.o enemy.o enigme_fichier.o bounding_box.o
 
 game: $(OBJS)
 	$(CC) $(OBJS) $(LDFLAGS) -o game

assets/img/animation/Layer 1.png

@@ -0,0 +1,8 @@
+#ifndef _BOUNDING_BOX_H_
+#define _BOUNDING_BOX_H_
+#include <SDL/SDL.h>
+
+int in_bounds(SDL_Rect x1,SDL_Rect x2);
+int collision(SDL_Rect x1,SDL_Rect x2);
+
+#endif

assets/img/animation/Layer 10.png

@@ -0,0 +1,52 @@
+#ifndef ENIGME_H_INCLUDED
+
+#define ENIGME_H_INCLUDED
+
+#include <SDL/SDL_ttf.h>
+
+#include <SDL/SDL.h>
+
+
+
+typedef struct {
+
+     char question[100];
+
+     char reponse[100];
+
+     char reponse2[100];
+
+     char reponse3[100]; 
+
+    SDL_Rect questionLocation;
+
+    SDL_Rect reponseLocation;
+
+    SDL_Rect textLocation;
+
+    TTF_Font *font;
+
+    SDL_Surface* screen;
+
+    SDL_Color textColor;
+
+    SDL_Color textColor_GREEN;
+
+    SDL_Color textColor_YELLOW ;
+
+    SDL_Color textColor_RED;
+
+} Enigme;
+
+
+
+void afficherEnigme(Enigme e, SDL_Surface* screen, TTF_Font* font, SDL_Color textColor);
+
+void genererEnigme(Enigme* p, char* nomfichier);
+
+//void animerEnigme(Enigme * e);
+
+
+
+#endif // ENIGME_H_INCLUDED
+

assets/img/animation/Layer 11.png

@@ -0,0 +1,28 @@
+#ifndef _ENIGME_FICHIER_H_
+#define _ENIGME_FICHIER_H_
+#include <SDL/SDL_image.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_ttf.h>
+#include "../include/bounding_box.h"
+#include <time.h>
+
+typedef struct{
+SDL_Surface *bg;
+SDL_Surface *question;
+SDL_Surface *reponses[4];
+SDL_Rect pos[4];
+int corr;
+SDL_Surface *won;
+SDL_Surface *lost;
+SDL_Surface *clock[16];
+int anim;
+}Enigme;
+
+
+void genererEnigme(Enigme *e,char *nomfichier);
+void animerenigme(Enigme * e);
+void afficherEnigme(Enigme e, SDL_Surface * screen, int x);
+int resolution(Enigme e);
+
+
+#endif

assets/img/animation/Layer 12.png

@@ -0,0 +1,10 @@
+#include "../include/bounding_box.h"
+
+int in_bounds(SDL_Rect x1,SDL_Rect x2)//louken x1 f west l x2
+{
+return(x1.x>=x2.x)&&(x1.x<=x2.x+x2.w)&&((x1.y>=x2.y)&&(x1.y<=x2.y+x2.h)||((x1.y<=x2.y)&&(x1.y+x2.h>=x2.y)));
+}
+int collision(SDL_Rect x1,SDL_Rect x2)//ken fama collision bin x1 w x2
+{
+return in_bounds(x1,x2)||in_bounds(x2,x1);
+}

assets/img/animation/Layer 13.png

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_image.h>
-#include "constants.h"
-#include "enemy.h"
+#include "../include/constants.h"
+#include "../include/enemy.h"
 
 void initEnemy(enemy *e)
 {
@@ -13,9 +13,9 @@ void initEnemy(enemy *e)
     }
     e->direction = 1;
     e->speed = 1;
-    e->max_steps = 100;
+    e->max_steps = 300;
     e->idle_time = 2000;
-    e->x = (SCREEN_W / 2 - (e->img->w / 6) - 96 / 2) + 100; // screen width - (width of img / sprite size) - (width of sprite / 2)
+    e->x = (SCREEN_W / 2 - (e->img->w / 6) - 96 / 2) - 100; // screen width - (width of img / sprite size) - (width of sprite / 2)
     e->y = (SCREEN_H / 2 - (e->img->h / 3) - 96 / 2) + 100; // screen height - (height of img / sprite size) - (height of sprite / 2)
 
     e->img_size.x = 0;

assets/img/animation/Layer 14.png

@@ -0,0 +1,114 @@
+#include "../include/enigme_fichier.h"
+#define QUESTION 3
+
+void genererEnigme(Enigme *e, char *nomfichier)
+{
+  char reponses[4][16];
+  char question[32];
+  char text[8];
+  FILE *fp;
+  char buff[255];
+  fp = fopen(nomfichier, "r");
+
+  int l = rand() % 3;
+  l *= 5;
+
+  for (int i = 0; i < l; i++)
+    fscanf(fp, "%s\n", buff);
+  fscanf(fp, "%s", question);
+  for (int i = 0; i < 4; i++)
+    fscanf(fp, "%s", reponses[i]);
+  SDL_Delay(100);
+
+  e->bg = IMG_Load("../assets/img/bg.jpg");
+  TTF_Font *font = TTF_OpenFont("../assets/font/Skatchboard.ttf", 50);
+  SDL_Color color = {125, 0, 125};
+  e->question = TTF_RenderText_Blended(font, question, color);
+  e->corr = l;
+
+  sprintf(question, "%s", reponses[e->corr]);
+  sprintf(reponses[e->corr], "%s", reponses[0]);
+  sprintf(reponses[0], "%s", question);
+
+  for (int i = 0; i < 4; i++)
+  {
+    sprintf(text, "%c %s", 65 + i, reponses[i]);
+    e->reponses[i] = TTF_RenderText_Solid(font, text, color);
+    e->pos[i].x = 200;
+    e->pos[i].y = 200 + 100 * i;
+    e->pos[i].w = e->reponses[i]->w;
+    e->pos[i].h = 60;
+  }
+
+  sprintf(text, "** congratulation **");
+  e->won = TTF_RenderText_Solid(font, text, color);
+
+  sprintf(text, "** wrong **");
+  e->lost = TTF_RenderText_Solid(font, text, color);
+
+  e->anim = 0;
+  for (int i = 0; i < 16; i++)
+  {
+    sprintf(buff, "../assets/img/animation/Layer %d.png", i + 1);
+    e->clock[i] = IMG_Load(buff);
+  }
+}
+
+void animerenigme(Enigme *e)
+{
+  e->anim++;
+  if (e->anim == 160)
+    e->anim = 0;
+}
+
+void afficherEnigme(Enigme e, SDL_Surface *screen, int x)
+{
+  SDL_Rect pos;
+  pos.x = 200;
+  pos.y = 90;
+  int i;
+  SDL_BlitSurface(e.bg, NULL, screen, NULL);
+  SDL_BlitSurface(e.question, NULL, screen, &pos);
+  for (i = 0; i < 4; i++)
+  {
+    SDL_BlitSurface(e.reponses[i], NULL, screen, &e.pos[i]);
+  }
+  e.pos[3].y += 100;
+  if (x == 1)
+    SDL_BlitSurface(e.won, NULL, screen, &e.pos[3]);
+  if (x == 0)
+    SDL_BlitSurface(e.lost, NULL, screen, &e.pos[3]);
+  pos.x = (screen->w - e.clock[e.anim / 10]->w);
+  pos.y = screen->h - e.clock[e.anim / 10]->h;
+  SDL_BlitSurface(e.clock[e.anim / 10], NULL, screen, NULL);
+  SDL_Flip(screen);
+}
+
+int resolution(Enigme e)
+{
+  Uint8 *keystate = SDL_GetKeyState(NULL);
+  if (keystate[SDLK_ESCAPE])
+    return 4;
+  if (keystate[SDLK_a])
+    return 0;
+  if (keystate[SDLK_b])
+    return 1;
+  if (keystate[SDLK_c])
+    return 2;
+  if (keystate[SDLK_d])
+    return 3;
+  int x, y;
+  Uint32 buttons = SDL_GetMouseState(&x, &y);
+  SDL_Rect pos;
+  pos.w = 5;
+  pos.h = 5;
+  pos.x = x;
+  pos.y = y;
+  for (int i = 0; i < 4; i++)
+  {
+    if ((buttons & SDL_BUTTON_LMASK) != 0)
+      if (collision(pos, e.pos[i]))
+        return i;
+  }
+  return -1;
+}

assets/img/animation/Layer 15.png

@@ -17,6 +17,7 @@
 #include "../include/stars.h"    //stars header
 #include "../include/settings.h" //settings header
 #include "../include/enemy.h"
+#include "../include/enigme_fichier.h"
 
 // screen
 SDL_Surface *screen;
@@ -64,18 +65,22 @@ text author;
 enemy enemy1;
 enemy enemy2;
 
+// enigme
+Enigme e;
+
 // logic
 SDL_Event event;
-int loop = 1;               // game loop
-int anim_B = 0;             // animation for the buttons
-int isButtonAnimated = 0;   // check if the button animated (to prevent FX spam)
-int selectedButton = 0;     // selected button (keyboard)
-int lastHoveredButton = -1; // last hovered button (keyboard and mouse) but made for keyboard
-int StopTheGame = 0;        // stop the game, if StopTheGame = 1 -> loop = 0
-int UI = 0;                 // UI = 0 -> main menu, UI = 1 -> settings menu, UI = 2 -> game
-int volume = 64;            // volume of the music (0 - 128)
-bool muteButtonOn = false;  // mute button state
-
+int loop = 1;                     // game loop
+int anim_B = 0;                   // animation for the buttons
+int isButtonAnimated = 0;         // check if the button animated (to prevent FX spam)
+int selectedButton = 0;           // selected button (keyboard)
+int lastHoveredButton = -1;       // last hovered button (keyboard and mouse) but made for keyboard
+int StopTheGame = 0;              // stop the game, if StopTheGame = 1 -> loop = 0
+int UI = 0;                       // UI = 0 -> main menu, UI = 1 -> settings menu, UI = 2 -> game
+int volume = 64;                  // volume of the music (0 - 128)
+bool muteButtonOn = false;        // mute button state
+static int collisionDetected = 0; // checks if collision detected
+static int enigmeDone = 0;        // checks if enigme is done
 /*
 ********************
 *****GAME BEGIN*****
@@ -160,6 +165,9 @@ int main()
     imageLoad_lvlmenutitle(&startMenuTitle);
     imageLoad_lvl1(&lvl1);
 
+    // loading enigme
+    genererEnigme(&e, "../assets/text/enigme.txt");
+
     // uint32 return time in milliseconds
     Uint32 last_time = SDL_GetTicks();
 
@@ -226,6 +234,8 @@ int main()
                             imageDrawClicked_playbutton(screen, playButton_C);
                             FXLoad(clickFX);
                             UI = 2;
+                            collisionDetected = 0;
+                            enigmeDone = 0;
                             break;
                         case 1:
                             // settings button pressed
@@ -449,9 +459,36 @@ int main()
             drawEnemytest(screen, enemy2);
             moveEnemytest(&enemy2); //* moveEnemy will call animateEnemy
             //************
-            if (collisionBB(enemy1.img_pos, enemy2.img_pos) == 1)
+            if (collisionBB(enemy1.img_pos, enemy2.img_pos) == 1 && collisionDetected == 0)
             {
                 printf(" collision detected \t");
+                collisionDetected = 1;
+            }
+            if (collisionDetected == 1 && enigmeDone == 0)
+            {
+                SDL_PumpEvents();
+                if (resolution(e) == -1)
+                {
+                    afficherEnigme(e, screen, -1);
+                    animerenigme(&e);
+                }
+                else
+                {
+                    if (resolution(e) == e.corr)
+                    {
+                        afficherEnigme(e, screen, 1);
+                        SDL_Delay(5000); //! remove SDL delay
+                        UI = 0;
+                        enigmeDone = 1;
+                    }
+                    else
+                    {
+                        afficherEnigme(e, screen, 0);
+                        SDL_Delay(5000); //! remove SDL delay
+                        UI = 0;
+                        enigmeDone = 1;
+                    }
+                }
             }
 
             while (SDL_PollEvent(&event))