Spiders

.gitignore

@@ -1,2 +1,3 @@
 **/[Bb]in/
 **/[Oo]bj/
+.vscode/

games/BelowTheSurface/level.h

@@ -604,7 +604,7 @@ class Easy  : public Level
             this->level_name = "Easy...enough";
             shared_ptr<Background> backg(new GreyBackground);
             this->background = backg;
-            this->password = "EZPZ";
+            this->password = "EZPZY";
             this->pre_level_side_text.push_back("Climb to the top...");
             this->pre_level_side_text.push_back("Watch out for snakes!");
             this->pre_level_image = bitmap_named("level3");
@@ -643,7 +643,7 @@ class BossLevel : public Level
             this->level_name = "Boss Fight";
             shared_ptr<Background> backg(new GreyBackground);
             this->background = backg;
-            this->password = "BOSS";
+            this->password = "BOSSY";
             this->pre_level_side_text.push_back("Water Rat is angry!");
             this->pre_level_side_text.push_back("...watch out!");
             this->pre_level_image = bitmap_named("level9");

games/BelowTheSurface/password.h

@@ -71,6 +71,7 @@ class Letter
     {
         return this->letter_height;
     };
+
 };
 
 class Password
@@ -80,6 +81,7 @@ class Password
     vector<std::shared_ptr<Letter>> underscore;
     int selection = 0;
     int letter = 0;
+    bool error = false;
 
 public:
     Password()
@@ -97,9 +99,43 @@ class Password
         }
     };
 
+
+    void incorrect_password()
+    {
+        play_sound_effect("BossAttack");
+        error = true;
+
+        //removes one of the letters when password is wrong to prevent endless loop of sound effect
+        if (letter > 0)
+        letter -= 2;
+        underscore[letter]->set_value("_");
+
+
+
+    };
+
+    void draw_error()
+    {
+        string error_message = "Try Again";
+        font font_type = font_named("DefaultFont");
+        int font_size = 15;
+        int width = text_width(error_message, font_type, font_size);
+        point_2d pos = screen_center();
+        pos.x = pos.x - width / 2;
+
+        if (error){
+        draw_text(error_message, COLOR_RED, font_type, font_size, pos.x, 10);
+        }
+        if (!error)
+        {
+            draw_text(" ", COLOR_RED, font_type, font_size, pos.x, 10);
+        }
+
+    };
+
     void process_alphabet()
     {
-        string alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ<~`";
+        string alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ<`";
         int row = 0;
         int col = 0;
         int letter_width = 0;
@@ -131,13 +167,6 @@ class Password
                 str = "DEL";
                 pos.y += letter_height * 2;
             }
-            if (str == "~")
-            {
-                str = "ENTER";
-                pos.x -= col * letter_width * 3;
-                pos.x += col * letter_width * 4;
-                pos.y += letter_height * 2;
-            }
             if (str == "`")
             {
                 str = "EXIT";
@@ -193,6 +222,7 @@ class Password
         if (key_typed(RIGHT_KEY)) // Orginal Key D_KEY
         {
             selection += 1;
+            error = false;
 
             if (selection > keyboard.size() - 1)
                 selection = 0;
@@ -201,6 +231,7 @@ class Password
         if (key_typed(LEFT_KEY)) // Orginal Key A_KEY
         {
             selection -= 1;
+            error = false;
 
             if (selection < 0)
                 selection = keyboard.size() - 1;
@@ -209,24 +240,30 @@ class Password
         if (key_typed(DOWN_KEY)) // Orginal Key S_KEY
         {
             selection += 6;
+            error = false;
 
-            if (selection > keyboard.size() - 1)
+            if (selection >= keyboard.size() - 1)
             {
-                if (selection < 30)
+                if (selection > 29)
+                    selection = 0 + (selection - 30);
+                else if (selection > 26)
                     selection = 27;
                 else
-                    selection = 0 + (selection - 30);
+                    selection = 26;
             }
         }
 
         if (key_typed(UP_KEY)) // Orginal Key W_KEY
         {
             selection -= 6;
+            error = false;
 
-            if (selection < 0)
+            if (selection <= 0)
             {
-                if (selection < -2)
+                if (selection < -4)
                     selection = selection + 30;
+                else if (selection < -3 )
+                    selection = 26;
                 else
                     selection = 27;
             }
@@ -250,14 +287,6 @@ class Password
                     letter -= 2;
                 underscore[letter]->set_value("_");
             }
-            else if (select == "ENTER")
-            {
-                string temp = "";
-                for (int i = 0; i < underscore.size(); i += 2)
-                    temp.append(underscore[i]->get_value());
-
-                password = temp;
-            }
             else if (select == "EXIT")
             {
                 password = "EXITEXITEXIT";
@@ -269,6 +298,16 @@ class Password
                 underscore[letter]->set_value(select);
                 letter += 2;
             }
+
+        }
+        //if last value in the array isn't an underscore anymore, password will automatically try to submit
+        if (underscore[8]->get_value() != "_")
+        {
+            string temp = "";
+            for (int i = 0; i < underscore.size(); i += 2)
+                temp.append(underscore[i]->get_value());
+
+            password = temp;
         }
 
         return password;
@@ -290,6 +329,7 @@ class Password
         string password = input();
         draw_element(keyboard);
         draw_element(underscore);
+        draw_error();
 
         return password;
     }

games/BelowTheSurface/screen.h

@@ -1191,6 +1191,8 @@ void PasswordScreen::update()
     {
         string password = password_screen->update();
 
+        write_line(password);
+
         if(password == "EXITEXITEXIT")
         {
             play_sound_effect("Select");
@@ -1204,7 +1206,7 @@ void PasswordScreen::update()
         {
             enter_level(2, screen);
         }
-        else if(password == "EZPZ_")
+        else if(password == "EZPZY")
         {
             enter_level(3, screen);
         }
@@ -1232,7 +1234,7 @@ void PasswordScreen::update()
         {
             enter_level(9, screen);
         }
-        else if(password == "BOSS_")
+        else if(password == "BOSSY")
         {
             enter_level(10, screen);
         }     
@@ -1244,5 +1246,12 @@ void PasswordScreen::update()
         {
             enter_level(50, screen);
         }
+        //if password is full and has no underscores, shows error message
+        else if(password.length() == 5 && password.find('_') == std::string::npos)
+        {
+
+            password_screen->incorrect_password();
+        }
+
     }
 }

games/VentureAdventure/.vscode/settings.json

@@ -5,5 +5,10 @@
         "CHERE_INVOKING": "enabled_from_arguments"
     },
     "terminal.integrated.shell.windows": "C:/msys64/usr/bin/bash.exe",
-    "terminal.integrated.shellArgs.windows": ["--login"],
+    "terminal.integrated.shellArgs.windows": [
+        "--login"
+    ],
+    "files.associations": {
+        "fstream": "cpp"
+    },
 }

games/VentureAdventure/Resources/animations/spider.txt

@@ -22,15 +22,18 @@ f:[18-20],[18-20],10,18
 //f:[21-23],[21-23],10,21
 
 //vectors
+//2nd and 3rd numbers in these sequences indicate the change in x and y position that the sprite changes each frame. Can be used to adjust enemy movement speed
+//For animation frame speed, refer to DUR above
 v:[0-2],0,4
-v:[6-8],-4,0
-v:[12-14],4,0
+v:[6-8],-0.8,0
+v:[12-14],0.8,0
 v:[18-20],0,-4
 v:40,0,0
 v:41,0,0
 v:42,0,0
 v:43,0,0
 
+
 //identifiers
 i:w_down,0
 i:w_left,6

games/VentureAdventure/Resources/bundles/icons.txt

@@ -1,8 +1,8 @@
 // Tiles & Art
 BITMAP,tiles,forest_tiles.png
-BITMAP,back,back.jpg
-BITMAP,stairs,stairs.png
+BITMAP,fire,fire.png
 BITMAP,title,title.png
+BITMAP,entry,ground_tiles.png
 
 // Sprite
 //BITMAP,hero,hero7.png
@@ -14,29 +14,40 @@ BITMAP,box4,box4.png
 // Sounds
 SOUND,diamond,diamond.wav
 SOUND,win,win.mp3
+SOUND,damage,damage2.wav
+SOUND,game_over,game_over.mp3
+SOUND,light_fire,lightfire.wav
 
 
 // Programming, Game Design & Development by Anthony George
+//  Modifications by Deakin University SIT374 AND SIT378 Adv Game Dev Team
 
 // Game Music by Michael George
 
 // Hero Attribution
 // Curt - cjc83486 - https://opengameart.org/content/rpg-character
 
 // Tile Art Attribution
-// 
+// https://opengameart.org/content/lpc-forest-tiles
+// Leonard Pabin - https://opengameart.org/users/leonard-pabin
 
 // Spider Art Attribution
 // Tuomo Untinen
 
 // Sound - diamond
 // DrMinky - https://freesound.org/s/166184/
 
-// Sound - stairs
-// thejoshuachang - https://freesound.org/people/thejoshuachang/sounds/203081/
+// Sound - lightfire
+// Pixabay - https://pixabay.com/sound-effects/torchlitthenblownout-42805/
+
+// Sound - game_over
+// Pixabay - https://pixabay.com/sound-effects/videogame-death-sound-43894/
+
+// Sound - damage, damage2 (May 2024)
+// CastielM 
 
 // Music
 // Two Finger Johnny by Kevin MacLeod
-// Link: https://incompetech.filmmusic.io/song/5008-two-finger-johnny
+// Link: https://incompetech.com/wordpress/2015/01/two-finger-johnny/
 // License: http://creativecommons.org/licenses/by/4.0/
 

games/VentureAdventure/Resources/levels/level1.txt

@@ -6,7 +6,7 @@
 30  50  50  50   0   0   1   0   1   1   1   1   0   0   0  30
 14   0   1   1   1   0   1   0 300   1 400   0   0   0 200  14
 30   0   0   0   0  53  53   1   1 300 300   0  50   0  50  30
-14 300  50  50 300  53   0 300   1   1   0  50  27  27  27  14
+14 300  50  50 300  53   0 300   84  1   0  50  27  27  27  14
 30   0 400  28   0   0 400 300   1   0   0   0 300   0   0  30
 14   0   0 300   0   0   0 300   1   0 400   0  27 400  27  14
 30   0   0   0  50  50  50   0   1   0  55  56 300 300  50  30

games/VentureAdventure/Resources/levels/level2.txt

@@ -6,11 +6,11 @@
 30 300 300  50   0   0   1   0   1   1   1   1  27  27  27  30
 14   0   1   0   1  50  27  27  27   0  27  27  27 400  27  14
 30  50   0   0  50 400  27   0   1   0  27 400  27   0  27  30
-14 400   0  50   0   0 300   0   0   1   0   0 300   0   0  14
+14 400   0  50   0   0 300   0   84  1   0   0  300  0   0  14
 30  50   0   0  50 400  27   0   1   0  27   0  27   0  27  30
-14   0   0   0   0  50  27  27  27  27   0   0  27   0  27  14
-30 200   0  50   0   0   0   0   1  50   0  27   0   0  27  30
+14 200   0   0   0  50  27  27  27  27   0   0  27   0  27  14
+30   0   0  50   0   0   0   0   1  50   0  27   0   0  27  30
 14   0   0   0   0   1  50   1   1   0 300  27   1  27 400  14
 30   0  50 400  50   0 400   0   0   0   0   1   1   0   0  30
-14 400   0   1   1   1   0   0 200   0  50  27  27  27 400  14
+14 400   0   1   1   1   0   0   0   0  50  27  27  27 400  14
 30  43  44  43  44  43  44  43  44  43  44  43  44  43  44  30

games/VentureAdventure/Resources/levels/level3.txt

@@ -1,16 +1,16 @@
 14  43  44  43  44  43  44  43  44  43  44  43  44  43  44  14
-30 400   0   1   1   0   0   0   0   0   0   0   0   0 400  30
-14   1  27  27  27 300  50 400  50 300  27 400  27   0   0  14
-30   1   1  27   0   0  50  50  50   0 400  27 400   0   0  30
-14   0   0  27   0   0  50 400  50   1  27 400  27   0   0  14
-30   0   0   0   0   0   1   0   1   1   1   1   0   0   0  30
-14   0  53   1  53   0   1   0   0   1   0 116 117 118 400  14
-30   0  53 400  53   0  55  56   1   0   0 132 133 134 400  30
-14   0  53  53  53   0   0   0   1   1   0 148 149 150 400  14
-30   0   0   0  53   0   0   0   1   0   0   0   0   0   0  30
-14   0   0   0 300   0   0   0   1   0   0   0   0   0   0  14
-30  27  27  27   0  50   0 300   1  27   0   0  50   0  50  30
-14  27 200  27   0  50 300   1  27   0  27   0  50 400  50  14
-30  27  27  27   1  50   0   0  27  27  27   0   1  50   0  30
-14  27 400   1   1  50  50 400  27   0  27 400 400  50   0  14
-30  43  44  43  44  43  44  43  44  43  44  43  44  43  44  30
+30 400   0  27   0   0 300 400 400 400 400   0 200  76  77  30
+14  53   0   0   0   0   0  55  56  50   0  50 300  92  93  14
+30 400  53   0   0   0   0   0  50   0   0   0   0  50  50  30
+14   0  50  55  56   0   0   0   0  50  50 300 300   0 400  14
+30   0   0  50 200   0 400   0   0   0   0   0   0   0   0  30
+14   0 300   0   0   0  50   0   0   0   0 300  27   0   0  14
+30   0   0 300   0   0   0   0   0   0  27 400   0   0   0  30
+14   0  50 400   0   0   0   0  84   0 119 120 121   0   0  14
+30   0  76  77   0   0   0   0   0   0 135 136 137  27 400  30
+14   0  92  93  50   0   0  50   0   0 151 152 153   0  28  14
+30 400   0 200  78   0   0   0   0   0  50   0  27 300 400  30
+96  97  96  97  94   0   0   0   0  28   0 300   0   0  50  14
+98  99  98  99  97 400  50   0   0 300   0   0   0 187  27  30
+114 115 114 115 113 50 400   0  53   0   0  28   0   0 400  14
+98  99  98  99  97  43  44  43  44  43  44  43  44  43  44  30

games/VentureAdventure/Resources/levels/level4.txt

@@ -0,0 +1,16 @@
+14  43  44  43  44  43  44  43  44  43  44  43  44  43  44  14
+30 400   0   1   1   0   0   0   0   0   0   0   0   0 400  30
+14   1  27  27  27 300  50 400  50 300  27 400  27   0   0  14
+30   1   1  27   0   0  50  50  50   0 400  27 400   0   0  30
+14   0   0  27   0   0  50 400  50   1  27 400  27   0   0  14
+30   0   0   0   0   0   1   0   1   1   1   1   0   0   0  30
+14   0  53   1  53   0   1   0   0   1   0 116 117 118 400  14
+30   0  53 400  53   0  55  56   1   0   0 132 133 134 400  30
+14   0  53  53  53   0   0   0  84   1   0 148 149 150 400  14
+30   0   0   0  53   0   0   0   1   0   0   0   0   0   0  30
+14   0   0   0 300   0   0   0   1   0   0   0   0   0   0  14
+30  27  27  27   0  50   0 300   1  27   0   0  50   0  50  30
+14  27   1  27   0  50 300   1  27   0  27   0  50 400  50  14
+30  27  27  27   1  50   0   0  27  27  27   0   1  50   0  30
+14  27 400   1   1  50  50 400  27   0  27 400 400  50   0  14
+30  43  44  43  44  43  44  43  44  43  44  43  44  43  44  30