diff --git a/.gitignore b/.gitignore index eda1596c..1b535737 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ **/[Bb]in/ **/[Oo]bj/ +# .vscode/ +.DS_Store \ No newline at end of file diff --git a/compiled-games/BelowTheSurface/BelowTheSurface-assets.tar.gz b/compiled-games/BelowTheSurface/BelowTheSurface-assets.tar.gz index c0790771..c6e18a7a 100644 Binary files a/compiled-games/BelowTheSurface/BelowTheSurface-assets.tar.gz and b/compiled-games/BelowTheSurface/BelowTheSurface-assets.tar.gz differ diff --git a/compiled-games/BelowTheSurface/BelowTheSurface-linux-arm.tar.gz b/compiled-games/BelowTheSurface/BelowTheSurface-linux-arm.tar.gz index fe6f259e..f704a2bc 100644 Binary files a/compiled-games/BelowTheSurface/BelowTheSurface-linux-arm.tar.gz and b/compiled-games/BelowTheSurface/BelowTheSurface-linux-arm.tar.gz differ diff --git a/compiled-games/BelowTheSurface/BelowTheSurface-linux-x86.tar.gz b/compiled-games/BelowTheSurface/BelowTheSurface-linux-x86.tar.gz index e9d578fe..c9574e56 100644 Binary files a/compiled-games/BelowTheSurface/BelowTheSurface-linux-x86.tar.gz and b/compiled-games/BelowTheSurface/BelowTheSurface-linux-x86.tar.gz differ diff --git a/compiled-games/BelowTheSurface/BelowTheSurface-win-x86.tar.gz b/compiled-games/BelowTheSurface/BelowTheSurface-win-x86.tar.gz index 34bcf66e..164810ca 100644 Binary files a/compiled-games/BelowTheSurface/BelowTheSurface-win-x86.tar.gz and b/compiled-games/BelowTheSurface/BelowTheSurface-win-x86.tar.gz differ diff --git a/compiled-games/Pingpong/Pingpong-assets.tar.gz b/compiled-games/Pingpong/Pingpong-assets.tar.gz new file mode 100644 index 00000000..b7be8a4b Binary files /dev/null and b/compiled-games/Pingpong/Pingpong-assets.tar.gz differ diff --git a/compiled-games/Pingpong/Pingpong-linux-arm.tar.gz b/compiled-games/Pingpong/Pingpong-linux-arm.tar.gz new file mode 100644 index 00000000..d7b0dcc2 Binary files /dev/null and b/compiled-games/Pingpong/Pingpong-linux-arm.tar.gz differ diff --git a/compiled-games/Pingpong/Pingpong-linux-x86.tar.gz b/compiled-games/Pingpong/Pingpong-linux-x86.tar.gz new file mode 100644 index 00000000..71d081de Binary files /dev/null and b/compiled-games/Pingpong/Pingpong-linux-x86.tar.gz differ diff --git a/compiled-games/Pingpong/Pingpong-win-x86.tar.gz b/compiled-games/Pingpong/Pingpong-win-x86.tar.gz new file mode 100644 index 00000000..1b0ed565 Binary files /dev/null and b/compiled-games/Pingpong/Pingpong-win-x86.tar.gz differ diff --git a/compiled-games/VentureAdventure/VentureAdventure-assets.tar.gz b/compiled-games/VentureAdventure/VentureAdventure-assets.tar.gz index f97ffb72..016ef91e 100644 Binary files a/compiled-games/VentureAdventure/VentureAdventure-assets.tar.gz and b/compiled-games/VentureAdventure/VentureAdventure-assets.tar.gz differ diff --git a/compiled-games/VentureAdventure/VentureAdventure-linux-arm.tar.gz b/compiled-games/VentureAdventure/VentureAdventure-linux-arm.tar.gz index 56f4ff48..c9e6bafe 100644 Binary files a/compiled-games/VentureAdventure/VentureAdventure-linux-arm.tar.gz and b/compiled-games/VentureAdventure/VentureAdventure-linux-arm.tar.gz differ diff --git a/compiled-games/VentureAdventure/VentureAdventure-linux-x86.tar.gz b/compiled-games/VentureAdventure/VentureAdventure-linux-x86.tar.gz index da0c4459..8e7909ce 100644 Binary files a/compiled-games/VentureAdventure/VentureAdventure-linux-x86.tar.gz and b/compiled-games/VentureAdventure/VentureAdventure-linux-x86.tar.gz differ diff --git a/compiled-games/VentureAdventure/VentureAdventure-win-x86.tar.gz b/compiled-games/VentureAdventure/VentureAdventure-win-x86.tar.gz index 9a670b5f..98004dcf 100644 Binary files a/compiled-games/VentureAdventure/VentureAdventure-win-x86.tar.gz and b/compiled-games/VentureAdventure/VentureAdventure-win-x86.tar.gz differ diff --git a/games/BelowTheSurface/Resources/bundles/playerbundle.txt b/games/BelowTheSurface/Resources/bundles/playerbundle.txt index 3a9e4142..2a439ac1 100644 --- a/games/BelowTheSurface/Resources/bundles/playerbundle.txt +++ b/games/BelowTheSurface/Resources/bundles/playerbundle.txt @@ -13,6 +13,7 @@ SOUND, Hurt, Hurt.wav SOUND, Water, Water.wav SOUND, Pickup, Pickup.wav SOUND, EnemyDead, EnemyDead.wav +SOUND, EnemyHurt, EnemyHurt.flac SOUND, Toxic, Toxic.mp3 SOUND, PickHeart, PickHeart.wav SOUND, Jumpfall, Jumpfall.wav diff --git a/games/BelowTheSurface/Resources/sounds/EnemyHurt.flac b/games/BelowTheSurface/Resources/sounds/EnemyHurt.flac new file mode 100644 index 00000000..5c514ac8 Binary files /dev/null and b/games/BelowTheSurface/Resources/sounds/EnemyHurt.flac differ diff --git a/games/BelowTheSurface/block.h b/games/BelowTheSurface/block.h index 26d8fa25..30c18084 100644 --- a/games/BelowTheSurface/block.h +++ b/games/BelowTheSurface/block.h @@ -1,5 +1,5 @@ #include "splashkit.h" -#include "types.h" +//#include "types.h" will not compile with this line included not sure if safe to delete #pragma once @@ -312,14 +312,24 @@ class Ladder : public Block class PipeBlock : public Block { + protected: + color shade; public: PipeBlock(bitmap cell_sheet, point_2d position, int cell) : Block(cell_sheet, position) { this->cell = cell; this->opts.draw_cell = this->cell; + this->shade.r = 0; + this->shade.g = 0; + this->shade.b = 0; + this->shade.a = 0.5; } - string test_collision(rectangle one) override { return "None"; }; + string test_collision(rectangle one) override + { + fill_rectangle(shade, intersection(one, hitbox)); + return "None"; + } }; class DecorativeBlock : public Block diff --git a/games/BelowTheSurface/collision.h b/games/BelowTheSurface/collision.h index bcd583c7..99f7be9e 100644 --- a/games/BelowTheSurface/collision.h +++ b/games/BelowTheSurface/collision.h @@ -32,6 +32,21 @@ bool test_rectangle_collision(rectangle one, rectangle two) return false; }; +void check_decoration_shadows(vector>> decorations, vector> level_players) +{ + for (int k = 0; k < level_players.size(); k++) + { + string collision = "None"; + for (int j = 0; j < decorations.size(); j++) + { + for (int i = 0; i < decorations[j].size(); i++) + { + collision = decorations[j][i]->test_collision(level_players[k]->get_player_hitbox()); + } + } + } +} + void check_solid_block_collisions(vector>> solid_blocks, vector> level_players) { for (int k = 0; k < level_players.size(); k++) @@ -63,7 +78,7 @@ void check_solid_block_collisions(vector>> solid_blocks } else if (collision == "Bottom") { - if (level_players[k]->is_on_floor() &&!(level_players[k]->is_on_ladder())) + if (level_players[k]->is_on_floor() && !(level_players[k]->is_on_ladder())) break; if (!sound_effect_playing("HeadHit")) @@ -94,7 +109,7 @@ void check_solid_block_collisions(vector>> solid_blocks sprite_start_animation(level_players[k]->get_player_sprite(), "ClimbIdle"); break; } - + level_players[k]->set_player_dx(0); level_players[k]->set_on_floor(false); sprite_set_x(level_players[k]->get_player_sprite(), sprite_x(level_players[k]->get_player_sprite()) - 3); @@ -121,10 +136,11 @@ void check_solid_block_collisions(vector>> solid_blocks break; } - if (collision == "None" && level_players[k]->is_on_ladder()==false){ + if (collision == "None" && level_players[k]->is_on_ladder() == false) + { level_players[k]->set_on_floor(false); } - + // if (collision == "None") // level_players[k]->set_on_floor(false); } @@ -153,7 +169,7 @@ void check_ladder_collisions(vector>> ladders, unorder for (int k = 0; k < level_players.size(); k++) { string collision = "None"; - bool y_condi = false,x_condi; + bool y_condi = false, x_condi; for (int j = 0; j < ladders.size(); j++) { for (int i = 0; i < ladders[j].size(); i++) @@ -162,11 +178,15 @@ void check_ladder_collisions(vector>> ladders, unorder top_side = ladders[j][i]->get_top(); x_condi = (sprite_x(level_players[k]->get_player_sprite()) > left_side - 32 && sprite_x(level_players[k]->get_player_sprite()) < left_side + 32); - for(int m = 0; m < lad_pos_top[left_side].size(); m++){ - if(sprite_y(level_players[k]->get_player_sprite()) <= (lad_pos_top[left_side][m] + 2) && sprite_y(level_players[k]->get_player_sprite()) >= (lad_pos_top[left_side][m] - 1)){ + for (int m = 0; m < lad_pos_top[left_side].size(); m++) + { + if (sprite_y(level_players[k]->get_player_sprite()) <= (lad_pos_top[left_side][m] + 2) && sprite_y(level_players[k]->get_player_sprite()) >= (lad_pos_top[left_side][m] - 1)) + { y_condi = true; break; - }else{ + } + else + { continue; } } @@ -174,23 +194,29 @@ void check_ladder_collisions(vector>> ladders, unorder collision = ladders[j][i]->test_collision(level_players[k]->get_player_hitbox()); // If player touch the top of the ladder in the exact x position - if(collision == "Top" && (x_condi && y_condi)){ - if(key_typed(level_players[k]->input.attack_key)) + if (collision == "Top" && (x_condi && y_condi)) + { + if (key_typed(level_players[k]->input.attack_key)) level_players[k]->set_player_won(true); - if(key_down(level_players[k]->input.crouch_key)){ //Drop the player down when crouch key is pressed + if (key_down(level_players[k]->input.crouch_key)) + { // Drop the player down when crouch key is pressed level_players[k]->set_on_floor(false); - }else{ + } + else + { level_players[k]->set_on_floor(true); level_players[k]->set_on_ladder(true); - //this prevent the player stepping on random ladder block that's not the top of the ladder - if(level_players[k]->get_state_type() != "JumpFall" || level_players[k]->get_state_type() != "JumpRise"){ + // this prevent the player stepping on random ladder block that's not the top of the ladder + if (level_players[k]->get_state_type() != "JumpFall" || level_players[k]->get_state_type() != "JumpRise") + { sprite_set_y(level_players[k]->get_player_sprite(), top_side - 1); } } break; - }else if (!(collision == "None" || collision == "Top") && (key_typed(level_players[k]->input.jump_key) || key_typed(level_players[k]->input.crouch_key))) + } + else if (!(collision == "None" || collision == "Top") && (key_typed(level_players[k]->input.jump_key) || key_typed(level_players[k]->input.crouch_key))) { level_players[k]->set_on_ladder(true); sprite_set_y(level_players[k]->get_player_sprite(), sprite_y(level_players[k]->get_player_sprite()) - 10); @@ -236,18 +262,18 @@ void check_enemy_solid_block_collisions(vector>> solid_ if (collision == "Top") { - if(level_enemies[k]->get_ai()->get_is_flying()) + if (level_enemies[k]->get_ai()->get_is_flying()) { level_enemies[k]->get_ai()->set_flying_up(true); } - + level_enemies[k]->get_ai()->set_on_floor(true); level_enemies[k]->get_ai()->set_y_value(solid_blocks[j][i]->get_top()); break; } else if (collision == "Bottom") { - if(level_enemies[k]->get_ai()->get_is_flying()) + if (level_enemies[k]->get_ai()->get_is_flying()) { level_enemies[k]->get_ai()->set_flying_up(false); } @@ -327,7 +353,7 @@ void check_enemy_player_collisions(vector> level_enemies, vect string collision = "None"; for (int j = 0; j < level_players.size(); j++) { - if(level_players[j]->get_state_type() == "Dying" || level_players[j]->get_state_type() == "Spawn") + if (level_players[j]->get_state_type() == "Dying" || level_players[j]->get_state_type() == "Spawn") continue; collision = level_enemies[i]->test_collision(level_players[j]->get_player_hitbox()); @@ -368,9 +394,11 @@ void check_enemy_player_collisions(vector> level_enemies, vect play_sound_effect("EnemyDead"); level_enemies[i]->set_dead(true); } - else + else { - if(level_enemies[i]->get_vulnerable()) + if (!sound_effect_playing("EnemyHurt")) + play_sound_effect("EnemyHurt"); + if (level_enemies[i]->get_vulnerable()) level_enemies[i]->take_damage(1); // By 1 hp. } level_players[j]->change_state(new JumpRiseState, "JumpRise"); @@ -434,8 +462,8 @@ void check_toxic_block_collisions(vector>> toxic, { if (!rect_on_screen(toxic[j][i]->get_block_hitbox())) continue; - - if(level_players[k]->get_state_type() == "Dying" || level_players[k]->get_state_type() == "Spawn") + + if (level_players[k]->get_state_type() == "Dying" || level_players[k]->get_state_type() == "Spawn") continue; collision = toxic[j][i]->test_collision(level_players[k]->get_player_hitbox()); @@ -485,7 +513,7 @@ void check_holdable_pipe_block_collisions(vectorget_cell() < 6) { @@ -546,7 +574,7 @@ void check_turnable_pipe_block_collisions(vectorset_turnable(false); break; } @@ -558,7 +586,7 @@ void check_turnable_pipe_block_collisions(vectorset_turnable(false); break; } @@ -567,8 +595,8 @@ void check_turnable_pipe_block_collisions(vectorset_turnable(false); break; } @@ -625,7 +653,7 @@ void check_multi_turnable_pipe_block_collisions(vectorget_turnable()) pipes[j][i]->set_turnable(false); else diff --git a/games/BelowTheSurface/level.h b/games/BelowTheSurface/level.h index 9b58bdb0..c6519a7c 100644 --- a/games/BelowTheSurface/level.h +++ b/games/BelowTheSurface/level.h @@ -402,6 +402,7 @@ class Level check_water_empty_multi_turn_block_collisions(empty_multi_turn_pipes, water); check_turn_multi_empty_pipes(multi_turn_pipes, empty_multi_turn_pipes); check_collectable_collisions(level_collectables, level_players); + check_decoration_shadows(decoration, level_players); } string get_level_name() @@ -604,7 +605,7 @@ class Easy : public Level this->level_name = "Easy...enough"; shared_ptr 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 +644,7 @@ class BossLevel : public Level this->level_name = "Boss Fight"; shared_ptr 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"); diff --git a/games/BelowTheSurface/password.h b/games/BelowTheSurface/password.h index 95a37584..8c71cc14 100644 --- a/games/BelowTheSurface/password.h +++ b/games/BelowTheSurface/password.h @@ -71,6 +71,7 @@ class Letter { return this->letter_height; }; + }; class Password @@ -80,6 +81,7 @@ class Password vector> 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; } diff --git a/games/BelowTheSurface/program.exe b/games/BelowTheSurface/program.exe new file mode 100644 index 00000000..4673b658 Binary files /dev/null and b/games/BelowTheSurface/program.exe differ diff --git a/games/BelowTheSurface/screen.h b/games/BelowTheSurface/screen.h index 319d27e9..c87a2cbf 100644 --- a/games/BelowTheSurface/screen.h +++ b/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(); + } + } } diff --git a/games/Pingpong/config.txt b/games/Pingpong/config.txt index 5c14700c..4e735c2b 100644 --- a/games/Pingpong/config.txt +++ b/games/Pingpong/config.txt @@ -20,10 +20,10 @@ #-------------------------------------------------------------------- # The title of your game (eg. Super Mario) -title= +title=Ping Pong # The name of the author (eg. Jane Doe) -author= +author=various # The genre of your game (eg. Platformer) genre= @@ -38,13 +38,13 @@ rating=PG language= # Path to your game thumbnail image (eg. images/icon.png) -image= +image=images/Pingpong-config-image.png # Location of git repo (eg. https://github.com/thoth-tech/arcade-games) -repository=https://github.com/yourname/yourgame +repository=https://github.com/thoth-tech/arcade-games # [Optional] Uncomment to include path to the game executable (game.exe) #executable=game.exe # [Optional] Uncomment to include specific compile commands - if you have a specific compile command (eg. 'make', 'skm g++ *.cpp -lstd++') -#compile-command=skm g++ *.cpp -o game \ No newline at end of file +#compile-command=skm g++ *.cpp -o game diff --git a/games/Pingpong/images/Pingpong-config-image.png b/games/Pingpong/images/Pingpong-config-image.png new file mode 100644 index 00000000..9ba2f767 Binary files /dev/null and b/games/Pingpong/images/Pingpong-config-image.png differ diff --git a/games/SkySurge/config.txt b/games/SkySurge/config.txt index 5dd3054c..8d5d4a56 100644 --- a/games/SkySurge/config.txt +++ b/games/SkySurge/config.txt @@ -1,15 +1,33 @@ -title =Sky Surge +#-------------------------------------------------------------------- +# PLEASE ONLY EDIT CONTENT AFTER THE "=" SIGN FOR EACH CONFIGURATION SETTING +#-------------------------------------------------------------------- +# The title of your game (eg. Super Mario) +title=Sky Surge + +# The name of the author (eg. Jane Doe) author=Ayan Masood +# The genre of your game (eg. Platformer) genre=Top down +# A Description of your game description=Survive waves of enemies using with increasing difficulty. +# A classification rating to advise the nature of the content (eg. MA 15+) rating=PG +# Programming language the game is written in (eg. C++) language=C# -image=images/SkySurge.png +# Path to your game thumbnail image (eg. images/icon.png) +image=images/SkySurge-config-image.png +# Location of git repo (eg. https://github.com/thoth-tech/arcade-games) repository=https://github.com/ayanmasood/arcade-games.git + +# [Optional] Uncomment to include path to the game executable (game.exe) +#executable=game.exe + +# [Optional] Uncomment to include specific compile commands - if you have a specific compile command (eg. 'make', 'skm g++ *.cpp -lstd++') +#compile-command=skm g++ *.cpp -o game diff --git a/games/SkySurge/images/SkySurge-config-image.png b/games/SkySurge/images/SkySurge-config-image.png new file mode 100644 index 00000000..630d4074 Binary files /dev/null and b/games/SkySurge/images/SkySurge-config-image.png differ diff --git a/games/SkySurge/images/SkySurge.PNG b/games/SkySurge/images/SkySurge.PNG deleted file mode 100644 index 5db9c54e..00000000 Binary files a/games/SkySurge/images/SkySurge.PNG and /dev/null differ diff --git a/games/VentureAdventure/.vscode/.BROWSE.VC.DB b/games/VentureAdventure/.vscode/.BROWSE.VC.DB deleted file mode 100644 index 5dd0ba9d..00000000 Binary files a/games/VentureAdventure/.vscode/.BROWSE.VC.DB and /dev/null differ diff --git a/games/VentureAdventure/.vscode/c_cpp_properties.json b/games/VentureAdventure/.vscode/c_cpp_properties.json deleted file mode 100644 index 29d5907f..00000000 --- a/games/VentureAdventure/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "configurations": [ - { - "name": "Mac", - "compilerPath": "/usr/bin/clang++", - "includePath": [ - "${workspaceRoot}", - "${workspaceRoot}/include/splashkit" - ], - "defines": [], - "intelliSenseMode": "clang-x64", - "cppStandard": "c++14", - "browse": { - "path": [ - "${workspaceRoot}", - "${workspaceRoot}/include/splashkit" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "${workspaceRoot}/.vscode/.browse.VC.db" - } - }, - { - "name": "Linux", - "compilerPath": "/usr/bin/g++", - "includePath": [ - "${workspaceRoot}", - "${workspaceRoot}/include/splashkit" - ], - "defines": [], - "intelliSenseMode": "gcc-x64", - "cppStandard": "c++14", - "browse": { - "path": [ - "${workspaceRoot}", - "${workspaceRoot}/include/splashkit" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "${workspaceRoot}/.vscode/.browse.VC.db" - } - }, - { - "name": "Win32", - "compilerPath": "C:/msys64/mingw64/bin/g++.exe", - "includePath": [ - "${workspaceRoot}", - "${workspaceRoot}/include/splashkit" - ], - "defines": [], - "intelliSenseMode": "gcc-x64", - "cppStandard": "c++14", - "browse": { - "path": [ - "${workspaceRoot}", - "${workspaceRoot}/include/splashkit" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "${workspaceRoot}/.vscode/.browse.VC.db" - } - } - ], - "version": 4 -} diff --git a/games/VentureAdventure/.vscode/launch.json b/games/VentureAdventure/.vscode/launch.json deleted file mode 100644 index d2366496..00000000 --- a/games/VentureAdventure/.vscode/launch.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "SKM C++ Launch", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceRoot}/${workspaceRootFolderName}", - "args": [], - "stopAtEntry": false, - "preLaunchTask": "build", - "cwd": "${workspaceRoot}", - "environment": [], - "externalConsole": true, - "internalConsoleOptions": "openOnSessionStart", - "linux": { - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - }, - "osx": { - "MIMode": "lldb" - }, - "windows": { - "MIMode": "gdb", - "miDebuggerPath": "C:/msys64/mingw64/bin/gdb.exe", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ], - "environment": [ { - "name": "PATH", - "value": "${env:PATH};C:/msys64/home/ageorge/.splashkit/lib/win64" - } - ] - } - } - ] -} \ No newline at end of file diff --git a/games/VentureAdventure/.vscode/settings.json b/games/VentureAdventure/.vscode/settings.json deleted file mode 100644 index 4de28418..00000000 --- a/games/VentureAdventure/.vscode/settings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "terminal.integrated.env.windows": { - "MSYSTEM": "MINGW64", - "MSYS2_PATH_TYPE": "inherit", - "CHERE_INVOKING": "enabled_from_arguments" - }, - "terminal.integrated.shell.windows": "C:/msys64/usr/bin/bash.exe", - "terminal.integrated.shellArgs.windows": ["--login"], -} \ No newline at end of file diff --git a/games/VentureAdventure/.vscode/tasks.json b/games/VentureAdventure/.vscode/tasks.json deleted file mode 100644 index 1b36f650..00000000 --- a/games/VentureAdventure/.vscode/tasks.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "build", - "type": "shell", - "presentation": { - "echo": true, - "reveal": "always", - "focus": false, - "panel": "shared", - "showReuseMessage": true, - "clear": true - }, - "windows": { - "command": "C:/msys64/usr/bin/bash.exe", - "args": [ "--login", "~/.splashkit/skm", "clang++", "-g", "*.cpp", "-o", "${workspaceRootFolderName}" ], - "options": { - "env": { - "MSYSTEM": "MINGW64", - "MSYS2_PATH_TYPE": "inherit", - "CHERE_INVOKING": "enabled_from_arguments", - "PATH": "${env:PATH};/home/ageorge/.splashkit" - } - } - }, - "osx": { - "command": "skm", - "args": [ "clang++", "-g", "*.cpp", "-o", "${workspaceRootFolderName}" ], - "options": { - "env": { - "PATH": "${env:PATH};/home/ageorge/.splashkit" - } - } - }, - "linux": { - "command": "skm", - "args": [ "clang++", "-g", "*.cpp", "-o", "${workspaceRootFolderName}" ], - "options": { - "env": { - "PATH": "${env:PATH};/home/ageorge/.splashkit" - } - } - }, - "problemMatcher": { - "owner": "cpp", - "fileLocation": [ - "relative", - "${workspaceRoot}" - ], - "pattern": { - "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$", - "file": 1, - "line": 2, - "column": 3, - "severity": 4, - "message": 5 - } - } - } - ], -} diff --git a/games/VentureAdventure/Venture Adventure Test Report.md b/games/VentureAdventure/Documentation/VentureAdventure_TestReport_Sep2023.md similarity index 100% rename from games/VentureAdventure/Venture Adventure Test Report.md rename to games/VentureAdventure/Documentation/VentureAdventure_TestReport_Sep2023.md diff --git a/games/VentureAdventure/config.txt b/games/VentureAdventure/config.txt index b0b1434b..da2c344a 100644 --- a/games/VentureAdventure/config.txt +++ b/games/VentureAdventure/config.txt @@ -38,7 +38,7 @@ rating=PG language=C++ # Path to your game thumbnail image (eg. images/icon.png) -image=images/VenAd.png +image=Resources/images/VenAd.png # Location of git repo (eg. https://github.com/studioant/arcade_game) repository=https://github.com/studioant/arcade_game diff --git a/games/VentureAdventure/game.cpp b/games/VentureAdventure/game.cpp index 4c296067..b5e6bf38 100644 --- a/games/VentureAdventure/game.cpp +++ b/games/VentureAdventure/game.cpp @@ -280,7 +280,7 @@ void handle_input(game_data &game) game.player.x_id = game.player.x_pos/TILESIZE; game.player.stopped = false; - if(key_down(UP_KEY) && game.player.walking == false) + if(key_down(W_KEY) && game.player.walking == false) { sprite_start_animation(game.player.player_sprite, "stand_u"); // stop at walls @@ -320,7 +320,7 @@ void handle_input(game_data &game) } } - if(key_down(DOWN_KEY) && game.player.walking == false) + if(key_down(S_KEY) && game.player.walking == false) { sprite_start_animation(game.player.player_sprite, "stand_d"); @@ -358,7 +358,7 @@ void handle_input(game_data &game) } } - if(key_down(LEFT_KEY) && game.player.walking == false) + if(key_down(A_KEY) && game.player.walking == false) { sprite_start_animation(game.player.player_sprite, "stand_l"); @@ -395,7 +395,7 @@ void handle_input(game_data &game) } } - if(key_down(RIGHT_KEY) && game.player.walking == false ) + if(key_down(D_KEY) && game.player.walking == false ) { sprite_start_animation(game.player.player_sprite, "stand_r"); @@ -654,7 +654,7 @@ void start_screen() int ven = 500; int adv = 542; - while( not key_down(SPACE_KEY) && not quit_requested() ) + while( not key_down(RETURN_KEY) && not quit_requested() && not key_down(ESCAPE_KEY)) { process_events(); @@ -665,7 +665,7 @@ void start_screen() if(ven == SCREEN_HEIGHT/2-150) { - draw_text("PRESS SPACE BAR TO START", COLOR_BLANCHED_ALMOND, "font.ttf", 20, SCREEN_WIDTH/2 - 50, SCREEN_HEIGHT-50, option_to_screen()); + draw_text("PRESS ENTER KEY TO START", COLOR_BLANCHED_ALMOND, "font.ttf", 20, SCREEN_WIDTH/2 - 50, SCREEN_HEIGHT-50, option_to_screen()); draw_text("By Anthony George", COLOR_BLANCHED_ALMOND, "font.ttf", 10, SCREEN_WIDTH/2+20, SCREEN_HEIGHT/2-50, option_to_screen()); } @@ -701,6 +701,12 @@ void hud(game_data &game, string levelnum) draw_text(" x 3" , COLOR_BLACK, "font.ttf", 20, 18*TILESIZE, 4*TILESIZE+10); draw_bitmap("gems", 17*TILESIZE, 5*TILESIZE, option_with_bitmap_cell(3)); draw_text(" x "+ to_string(game.player.gem), COLOR_BLACK, "font.ttf", 20, 18*TILESIZE, 5*TILESIZE+10); + draw_text("Move: ", COLOR_BLACK, "font.ttf", 20, 16*TILESIZE + 5, 9*TILESIZE); + draw_text("WASD Keys /", COLOR_BLACK, "font.ttf", 20, 16*TILESIZE + 5, 10*TILESIZE); + draw_text(" Joystick ", COLOR_BLACK, "font.ttf", 20, 19*TILESIZE - 5, 11*TILESIZE - 10); + draw_text("Restart Level: ", COLOR_BLACK, "font.ttf", 20, 16*TILESIZE + 5, 12*TILESIZE); + draw_text("R key /", COLOR_BLACK, "font.ttf", 20, 16*TILESIZE + 5, 13*TILESIZE); + draw_text("Button 1 ", COLOR_BLACK, "font.ttf", 20, 18*TILESIZE, 14*TILESIZE - 10); } diff --git a/games/VentureAdventure/game.exe b/games/VentureAdventure/game.exe new file mode 100644 index 00000000..8e572f8e Binary files /dev/null and b/games/VentureAdventure/game.exe differ diff --git a/games/SingleCombat/myeasylog.log b/games/VentureAdventure/myeasylog.log similarity index 100% rename from games/SingleCombat/myeasylog.log rename to games/VentureAdventure/myeasylog.log diff --git a/games/VentureAdventure/program.cpp b/games/VentureAdventure/program.cpp index 6fcf53d1..2bdff06f 100644 --- a/games/VentureAdventure/program.cpp +++ b/games/VentureAdventure/program.cpp @@ -17,7 +17,9 @@ int main() window_toggle_border("VentureAdventure"); load_resources(); + //use this to adjust starting level (for debugging) or to change total number of levels when adding new levels string map = "Resources/levels/level1.txt"; + int totallevels = 3; int level = 1; bool win; string levelnum = "Level 1"; @@ -50,11 +52,16 @@ int main() if (game.player.attacked == true) draw_text("Game Over", COLOR_BLANCHED_ALMOND, "font.ttf", 70, SCREEN_WIDTH / 2 - 138, SCREEN_HEIGHT / 2 - 48, option_to_screen()); + if (key_down(R_KEY)) + { + game = new_game(map); + } + start_debug(game); refresh_screen(60); - if (win == true && level < 3) + if (win == true && level < totallevels) { level++; map = "Resources/levels/level"; @@ -65,7 +72,8 @@ int main() game = new_game(map); }; - if (win == true && level == 3) + + if (win == true && level >= totallevels) { delay(5000); diff --git a/games/car-race/config.txt b/games/car-race/config.txt index e631f979..b0735e1d 100644 --- a/games/car-race/config.txt +++ b/games/car-race/config.txt @@ -20,25 +20,25 @@ #-------------------------------------------------------------------- # The title of your game (eg. Super Mario) -title= +title=car-race # The name of the author (eg. Jane Doe) -author= +author=Khushi Laddi # The genre of your game (eg. Platformer) -genre= +genre=Top down # A Description of your game -description= +description=Car racing game # A classification rating to advise the nature of the content (eg. MA 15+) rating=PG # Programming language the game is written in (eg. C++) -language= +language=C++ # Path to your game thumbnail image (eg. images/icon.png) -image= +image=images/car-race-config-image.png # Location of git repo (eg. https://github.com/thoth-tech/arcade-games) repository=https://github.com/yourname/yourgame diff --git a/games/car-race/images/car-race-config-image.png b/games/car-race/images/car-race-config-image.png new file mode 100644 index 00000000..4cbff04e Binary files /dev/null and b/games/car-race/images/car-race-config-image.png differ diff --git a/games/SingleCombat/.editorconfig b/in-progress-games/SingleCombat/.editorconfig similarity index 100% rename from games/SingleCombat/.editorconfig rename to in-progress-games/SingleCombat/.editorconfig diff --git a/games/SingleCombat/.vscode/c_cpp_properties.json b/in-progress-games/SingleCombat/.vscode/c_cpp_properties.json similarity index 100% rename from games/SingleCombat/.vscode/c_cpp_properties.json rename to in-progress-games/SingleCombat/.vscode/c_cpp_properties.json diff --git a/games/SingleCombat/.vscode/launch.json b/in-progress-games/SingleCombat/.vscode/launch.json similarity index 100% rename from games/SingleCombat/.vscode/launch.json rename to in-progress-games/SingleCombat/.vscode/launch.json diff --git a/games/SingleCombat/.vscode/settings.json b/in-progress-games/SingleCombat/.vscode/settings.json similarity index 100% rename from games/SingleCombat/.vscode/settings.json rename to in-progress-games/SingleCombat/.vscode/settings.json diff --git a/games/SingleCombat/.vscode/tasks.json b/in-progress-games/SingleCombat/.vscode/tasks.json similarity index 100% rename from games/SingleCombat/.vscode/tasks.json rename to in-progress-games/SingleCombat/.vscode/tasks.json diff --git a/games/SingleCombat/Documentation/BugsAndIdeasLog.md b/in-progress-games/SingleCombat/Documentation/BugsAndIdeasLog.md similarity index 100% rename from games/SingleCombat/Documentation/BugsAndIdeasLog.md rename to in-progress-games/SingleCombat/Documentation/BugsAndIdeasLog.md diff --git a/games/SingleCombat/Documentation/CaptainsLog.md b/in-progress-games/SingleCombat/Documentation/CaptainsLog.md similarity index 100% rename from games/SingleCombat/Documentation/CaptainsLog.md rename to in-progress-games/SingleCombat/Documentation/CaptainsLog.md diff --git a/games/SingleCombat/Documentation/ClassDescriptionsAndDecisions.md b/in-progress-games/SingleCombat/Documentation/ClassDescriptionsAndDecisions.md similarity index 100% rename from games/SingleCombat/Documentation/ClassDescriptionsAndDecisions.md rename to in-progress-games/SingleCombat/Documentation/ClassDescriptionsAndDecisions.md diff --git a/games/SingleCombat/Documentation/GameDesign/GameDesignWorkingDocument.md b/in-progress-games/SingleCombat/Documentation/GameDesign/GameDesignWorkingDocument.md similarity index 100% rename from games/SingleCombat/Documentation/GameDesign/GameDesignWorkingDocument.md rename to in-progress-games/SingleCombat/Documentation/GameDesign/GameDesignWorkingDocument.md diff --git a/games/SingleCombat/Documentation/GameDesign/OriginalSingleCombatGameProposal.md b/in-progress-games/SingleCombat/Documentation/GameDesign/OriginalSingleCombatGameProposal.md similarity index 100% rename from games/SingleCombat/Documentation/GameDesign/OriginalSingleCombatGameProposal.md rename to in-progress-games/SingleCombat/Documentation/GameDesign/OriginalSingleCombatGameProposal.md diff --git a/games/SingleCombat/Documentation/GameDesign/singleplayerGameDimensions1.png b/in-progress-games/SingleCombat/Documentation/GameDesign/singleplayerGameDimensions1.png similarity index 100% rename from games/SingleCombat/Documentation/GameDesign/singleplayerGameDimensions1.png rename to in-progress-games/SingleCombat/Documentation/GameDesign/singleplayerGameDimensions1.png diff --git a/games/SingleCombat/Documentation/MUST_READ_GuideToContribute.md b/in-progress-games/SingleCombat/Documentation/MUST_READ_GuideToContribute.md similarity index 100% rename from games/SingleCombat/Documentation/MUST_READ_GuideToContribute.md rename to in-progress-games/SingleCombat/Documentation/MUST_READ_GuideToContribute.md diff --git a/games/SingleCombat/Documentation/UMLdiagrams/UMLDiagram_13Dec2023.png b/in-progress-games/SingleCombat/Documentation/UMLdiagrams/UMLDiagram_13Dec2023.png similarity index 100% rename from games/SingleCombat/Documentation/UMLdiagrams/UMLDiagram_13Dec2023.png rename to in-progress-games/SingleCombat/Documentation/UMLdiagrams/UMLDiagram_13Dec2023.png diff --git a/games/SingleCombat/Documentation/UMLdiagrams/UMLdiagram_4Dec2023.png b/in-progress-games/SingleCombat/Documentation/UMLdiagrams/UMLdiagram_4Dec2023.png similarity index 100% rename from games/SingleCombat/Documentation/UMLdiagrams/UMLdiagram_4Dec2023.png rename to in-progress-games/SingleCombat/Documentation/UMLdiagrams/UMLdiagram_4Dec2023.png diff --git a/games/SingleCombat/Documentation/UMLdiagrams/UMLdiagram_9Dec2023.png b/in-progress-games/SingleCombat/Documentation/UMLdiagrams/UMLdiagram_9Dec2023.png similarity index 100% rename from games/SingleCombat/Documentation/UMLdiagrams/UMLdiagram_9Dec2023.png rename to in-progress-games/SingleCombat/Documentation/UMLdiagrams/UMLdiagram_9Dec2023.png diff --git a/games/SingleCombat/Documentation/UMLdiagrams/finitestatemachine.png b/in-progress-games/SingleCombat/Documentation/UMLdiagrams/finitestatemachine.png similarity index 100% rename from games/SingleCombat/Documentation/UMLdiagrams/finitestatemachine.png rename to in-progress-games/SingleCombat/Documentation/UMLdiagrams/finitestatemachine.png diff --git a/games/SingleCombat/Resources/animations/readme.txt b/in-progress-games/SingleCombat/Resources/animations/readme.txt similarity index 100% rename from games/SingleCombat/Resources/animations/readme.txt rename to in-progress-games/SingleCombat/Resources/animations/readme.txt diff --git a/games/SingleCombat/Resources/bundles/game_bundle.txt b/in-progress-games/SingleCombat/Resources/bundles/game_bundle.txt similarity index 100% rename from games/SingleCombat/Resources/bundles/game_bundle.txt rename to in-progress-games/SingleCombat/Resources/bundles/game_bundle.txt diff --git a/games/SingleCombat/Resources/bundles/readme.txt b/in-progress-games/SingleCombat/Resources/bundles/readme.txt similarity index 100% rename from games/SingleCombat/Resources/bundles/readme.txt rename to in-progress-games/SingleCombat/Resources/bundles/readme.txt diff --git a/games/SingleCombat/Resources/databases/readme.txt b/in-progress-games/SingleCombat/Resources/databases/readme.txt similarity index 100% rename from games/SingleCombat/Resources/databases/readme.txt rename to in-progress-games/SingleCombat/Resources/databases/readme.txt diff --git a/games/SingleCombat/Resources/fonts/readme.txt b/in-progress-games/SingleCombat/Resources/fonts/readme.txt similarity index 100% rename from games/SingleCombat/Resources/fonts/readme.txt rename to in-progress-games/SingleCombat/Resources/fonts/readme.txt diff --git a/games/SingleCombat/Resources/images/blueblock.png b/in-progress-games/SingleCombat/Resources/images/blueblock.png similarity index 100% rename from games/SingleCombat/Resources/images/blueblock.png rename to in-progress-games/SingleCombat/Resources/images/blueblock.png diff --git a/games/SingleCombat/Resources/images/blueblock75.png b/in-progress-games/SingleCombat/Resources/images/blueblock75.png similarity index 100% rename from games/SingleCombat/Resources/images/blueblock75.png rename to in-progress-games/SingleCombat/Resources/images/blueblock75.png diff --git a/games/SingleCombat/Resources/images/bluebreaker.png b/in-progress-games/SingleCombat/Resources/images/bluebreaker.png similarity index 100% rename from games/SingleCombat/Resources/images/bluebreaker.png rename to in-progress-games/SingleCombat/Resources/images/bluebreaker.png diff --git a/games/SingleCombat/Resources/images/bluebreaker75.png b/in-progress-games/SingleCombat/Resources/images/bluebreaker75.png similarity index 100% rename from games/SingleCombat/Resources/images/bluebreaker75.png rename to in-progress-games/SingleCombat/Resources/images/bluebreaker75.png diff --git a/games/SingleCombat/Resources/images/greenblock.png b/in-progress-games/SingleCombat/Resources/images/greenblock.png similarity index 100% rename from games/SingleCombat/Resources/images/greenblock.png rename to in-progress-games/SingleCombat/Resources/images/greenblock.png diff --git a/games/SingleCombat/Resources/images/greenblock75.png b/in-progress-games/SingleCombat/Resources/images/greenblock75.png similarity index 100% rename from games/SingleCombat/Resources/images/greenblock75.png rename to in-progress-games/SingleCombat/Resources/images/greenblock75.png diff --git a/games/SingleCombat/Resources/images/greenbreaker.png b/in-progress-games/SingleCombat/Resources/images/greenbreaker.png similarity index 100% rename from games/SingleCombat/Resources/images/greenbreaker.png rename to in-progress-games/SingleCombat/Resources/images/greenbreaker.png diff --git a/games/SingleCombat/Resources/images/greenbreaker75.png b/in-progress-games/SingleCombat/Resources/images/greenbreaker75.png similarity index 100% rename from games/SingleCombat/Resources/images/greenbreaker75.png rename to in-progress-games/SingleCombat/Resources/images/greenbreaker75.png diff --git a/games/SingleCombat/Resources/images/readme.txt b/in-progress-games/SingleCombat/Resources/images/readme.txt similarity index 100% rename from games/SingleCombat/Resources/images/readme.txt rename to in-progress-games/SingleCombat/Resources/images/readme.txt diff --git a/games/SingleCombat/Resources/images/redblock.png b/in-progress-games/SingleCombat/Resources/images/redblock.png similarity index 100% rename from games/SingleCombat/Resources/images/redblock.png rename to in-progress-games/SingleCombat/Resources/images/redblock.png diff --git a/games/SingleCombat/Resources/images/redblock75.png b/in-progress-games/SingleCombat/Resources/images/redblock75.png similarity index 100% rename from games/SingleCombat/Resources/images/redblock75.png rename to in-progress-games/SingleCombat/Resources/images/redblock75.png diff --git a/games/SingleCombat/Resources/images/redbreaker.png b/in-progress-games/SingleCombat/Resources/images/redbreaker.png similarity index 100% rename from games/SingleCombat/Resources/images/redbreaker.png rename to in-progress-games/SingleCombat/Resources/images/redbreaker.png diff --git a/games/SingleCombat/Resources/images/redbreaker75.png b/in-progress-games/SingleCombat/Resources/images/redbreaker75.png similarity index 100% rename from games/SingleCombat/Resources/images/redbreaker75.png rename to in-progress-games/SingleCombat/Resources/images/redbreaker75.png diff --git a/games/SingleCombat/Resources/images/yellowblock.png b/in-progress-games/SingleCombat/Resources/images/yellowblock.png similarity index 100% rename from games/SingleCombat/Resources/images/yellowblock.png rename to in-progress-games/SingleCombat/Resources/images/yellowblock.png diff --git a/games/SingleCombat/Resources/images/yellowblock75.png b/in-progress-games/SingleCombat/Resources/images/yellowblock75.png similarity index 100% rename from games/SingleCombat/Resources/images/yellowblock75.png rename to in-progress-games/SingleCombat/Resources/images/yellowblock75.png diff --git a/games/SingleCombat/Resources/images/yellowbreaker.png b/in-progress-games/SingleCombat/Resources/images/yellowbreaker.png similarity index 100% rename from games/SingleCombat/Resources/images/yellowbreaker.png rename to in-progress-games/SingleCombat/Resources/images/yellowbreaker.png diff --git a/games/SingleCombat/Resources/images/yellowbreaker75.png b/in-progress-games/SingleCombat/Resources/images/yellowbreaker75.png similarity index 100% rename from games/SingleCombat/Resources/images/yellowbreaker75.png rename to in-progress-games/SingleCombat/Resources/images/yellowbreaker75.png diff --git a/games/SingleCombat/Resources/json/readme.txt b/in-progress-games/SingleCombat/Resources/json/readme.txt similarity index 100% rename from games/SingleCombat/Resources/json/readme.txt rename to in-progress-games/SingleCombat/Resources/json/readme.txt diff --git a/games/SingleCombat/Resources/server/readme.txt b/in-progress-games/SingleCombat/Resources/server/readme.txt similarity index 100% rename from games/SingleCombat/Resources/server/readme.txt rename to in-progress-games/SingleCombat/Resources/server/readme.txt diff --git a/games/SingleCombat/Resources/sounds/readme.txt b/in-progress-games/SingleCombat/Resources/sounds/readme.txt similarity index 100% rename from games/SingleCombat/Resources/sounds/readme.txt rename to in-progress-games/SingleCombat/Resources/sounds/readme.txt diff --git a/games/SingleCombat/SingleCombat.exe b/in-progress-games/SingleCombat/SingleCombat.exe similarity index 100% rename from games/SingleCombat/SingleCombat.exe rename to in-progress-games/SingleCombat/SingleCombat.exe diff --git a/games/SingleCombat/block.cpp b/in-progress-games/SingleCombat/block.cpp similarity index 100% rename from games/SingleCombat/block.cpp rename to in-progress-games/SingleCombat/block.cpp diff --git a/games/SingleCombat/block.h b/in-progress-games/SingleCombat/block.h similarity index 100% rename from games/SingleCombat/block.h rename to in-progress-games/SingleCombat/block.h diff --git a/games/SingleCombat/board.cpp b/in-progress-games/SingleCombat/board.cpp similarity index 100% rename from games/SingleCombat/board.cpp rename to in-progress-games/SingleCombat/board.cpp diff --git a/games/SingleCombat/board.h b/in-progress-games/SingleCombat/board.h similarity index 100% rename from games/SingleCombat/board.h rename to in-progress-games/SingleCombat/board.h diff --git a/games/SingleCombat/config.txt b/in-progress-games/SingleCombat/config.txt similarity index 100% rename from games/SingleCombat/config.txt rename to in-progress-games/SingleCombat/config.txt diff --git a/games/SingleCombat/include/splashkit/adapter_type_mapper.h b/in-progress-games/SingleCombat/include/splashkit/adapter_type_mapper.h similarity index 100% rename from games/SingleCombat/include/splashkit/adapter_type_mapper.h rename to in-progress-games/SingleCombat/include/splashkit/adapter_type_mapper.h diff --git a/games/SingleCombat/include/splashkit/animations.h b/in-progress-games/SingleCombat/include/splashkit/animations.h similarity index 100% rename from games/SingleCombat/include/splashkit/animations.h rename to in-progress-games/SingleCombat/include/splashkit/animations.h diff --git a/games/SingleCombat/include/splashkit/audio.h b/in-progress-games/SingleCombat/include/splashkit/audio.h similarity index 100% rename from games/SingleCombat/include/splashkit/audio.h rename to in-progress-games/SingleCombat/include/splashkit/audio.h diff --git a/games/SingleCombat/include/splashkit/basics.h b/in-progress-games/SingleCombat/include/splashkit/basics.h similarity index 100% rename from games/SingleCombat/include/splashkit/basics.h rename to in-progress-games/SingleCombat/include/splashkit/basics.h diff --git a/games/SingleCombat/include/splashkit/bundles.h b/in-progress-games/SingleCombat/include/splashkit/bundles.h similarity index 100% rename from games/SingleCombat/include/splashkit/bundles.h rename to in-progress-games/SingleCombat/include/splashkit/bundles.h diff --git a/games/SingleCombat/include/splashkit/camera.h b/in-progress-games/SingleCombat/include/splashkit/camera.h similarity index 100% rename from games/SingleCombat/include/splashkit/camera.h rename to in-progress-games/SingleCombat/include/splashkit/camera.h diff --git a/games/SingleCombat/include/splashkit/circle_drawing.h b/in-progress-games/SingleCombat/include/splashkit/circle_drawing.h similarity index 100% rename from games/SingleCombat/include/splashkit/circle_drawing.h rename to in-progress-games/SingleCombat/include/splashkit/circle_drawing.h diff --git a/games/SingleCombat/include/splashkit/circle_geometry.h b/in-progress-games/SingleCombat/include/splashkit/circle_geometry.h similarity index 100% rename from games/SingleCombat/include/splashkit/circle_geometry.h rename to in-progress-games/SingleCombat/include/splashkit/circle_geometry.h diff --git a/games/SingleCombat/include/splashkit/clipping.h b/in-progress-games/SingleCombat/include/splashkit/clipping.h similarity index 100% rename from games/SingleCombat/include/splashkit/clipping.h rename to in-progress-games/SingleCombat/include/splashkit/clipping.h diff --git a/games/SingleCombat/include/splashkit/collisions.h b/in-progress-games/SingleCombat/include/splashkit/collisions.h similarity index 100% rename from games/SingleCombat/include/splashkit/collisions.h rename to in-progress-games/SingleCombat/include/splashkit/collisions.h diff --git a/games/SingleCombat/include/splashkit/color.h b/in-progress-games/SingleCombat/include/splashkit/color.h similarity index 100% rename from games/SingleCombat/include/splashkit/color.h rename to in-progress-games/SingleCombat/include/splashkit/color.h diff --git a/games/SingleCombat/include/splashkit/database.h b/in-progress-games/SingleCombat/include/splashkit/database.h similarity index 100% rename from games/SingleCombat/include/splashkit/database.h rename to in-progress-games/SingleCombat/include/splashkit/database.h diff --git a/games/SingleCombat/include/splashkit/drawing_options.h b/in-progress-games/SingleCombat/include/splashkit/drawing_options.h similarity index 100% rename from games/SingleCombat/include/splashkit/drawing_options.h rename to in-progress-games/SingleCombat/include/splashkit/drawing_options.h diff --git a/games/SingleCombat/include/splashkit/ellipse_drawing.h b/in-progress-games/SingleCombat/include/splashkit/ellipse_drawing.h similarity index 100% rename from games/SingleCombat/include/splashkit/ellipse_drawing.h rename to in-progress-games/SingleCombat/include/splashkit/ellipse_drawing.h diff --git a/games/SingleCombat/include/splashkit/geometry.h b/in-progress-games/SingleCombat/include/splashkit/geometry.h similarity index 100% rename from games/SingleCombat/include/splashkit/geometry.h rename to in-progress-games/SingleCombat/include/splashkit/geometry.h diff --git a/games/SingleCombat/include/splashkit/graphics.h b/in-progress-games/SingleCombat/include/splashkit/graphics.h similarity index 100% rename from games/SingleCombat/include/splashkit/graphics.h rename to in-progress-games/SingleCombat/include/splashkit/graphics.h diff --git a/games/SingleCombat/include/splashkit/images.h b/in-progress-games/SingleCombat/include/splashkit/images.h similarity index 100% rename from games/SingleCombat/include/splashkit/images.h rename to in-progress-games/SingleCombat/include/splashkit/images.h diff --git a/games/SingleCombat/include/splashkit/input.h b/in-progress-games/SingleCombat/include/splashkit/input.h similarity index 100% rename from games/SingleCombat/include/splashkit/input.h rename to in-progress-games/SingleCombat/include/splashkit/input.h diff --git a/games/SingleCombat/include/splashkit/json.h b/in-progress-games/SingleCombat/include/splashkit/json.h similarity index 100% rename from games/SingleCombat/include/splashkit/json.h rename to in-progress-games/SingleCombat/include/splashkit/json.h diff --git a/games/SingleCombat/include/splashkit/keyboard_input.h b/in-progress-games/SingleCombat/include/splashkit/keyboard_input.h similarity index 100% rename from games/SingleCombat/include/splashkit/keyboard_input.h rename to in-progress-games/SingleCombat/include/splashkit/keyboard_input.h diff --git a/games/SingleCombat/include/splashkit/line_drawing.h b/in-progress-games/SingleCombat/include/splashkit/line_drawing.h similarity index 100% rename from games/SingleCombat/include/splashkit/line_drawing.h rename to in-progress-games/SingleCombat/include/splashkit/line_drawing.h diff --git a/games/SingleCombat/include/splashkit/line_geometry.h b/in-progress-games/SingleCombat/include/splashkit/line_geometry.h similarity index 100% rename from games/SingleCombat/include/splashkit/line_geometry.h rename to in-progress-games/SingleCombat/include/splashkit/line_geometry.h diff --git a/games/SingleCombat/include/splashkit/logging.h b/in-progress-games/SingleCombat/include/splashkit/logging.h similarity index 100% rename from games/SingleCombat/include/splashkit/logging.h rename to in-progress-games/SingleCombat/include/splashkit/logging.h diff --git a/games/SingleCombat/include/splashkit/matrix_2d.h b/in-progress-games/SingleCombat/include/splashkit/matrix_2d.h similarity index 100% rename from games/SingleCombat/include/splashkit/matrix_2d.h rename to in-progress-games/SingleCombat/include/splashkit/matrix_2d.h diff --git a/games/SingleCombat/include/splashkit/mouse_input.h b/in-progress-games/SingleCombat/include/splashkit/mouse_input.h similarity index 100% rename from games/SingleCombat/include/splashkit/mouse_input.h rename to in-progress-games/SingleCombat/include/splashkit/mouse_input.h diff --git a/games/SingleCombat/include/splashkit/music.h b/in-progress-games/SingleCombat/include/splashkit/music.h similarity index 100% rename from games/SingleCombat/include/splashkit/music.h rename to in-progress-games/SingleCombat/include/splashkit/music.h diff --git a/games/SingleCombat/include/splashkit/networking.h b/in-progress-games/SingleCombat/include/splashkit/networking.h similarity index 100% rename from games/SingleCombat/include/splashkit/networking.h rename to in-progress-games/SingleCombat/include/splashkit/networking.h diff --git a/games/SingleCombat/include/splashkit/physics.h b/in-progress-games/SingleCombat/include/splashkit/physics.h similarity index 100% rename from games/SingleCombat/include/splashkit/physics.h rename to in-progress-games/SingleCombat/include/splashkit/physics.h diff --git a/games/SingleCombat/include/splashkit/point_drawing.h b/in-progress-games/SingleCombat/include/splashkit/point_drawing.h similarity index 100% rename from games/SingleCombat/include/splashkit/point_drawing.h rename to in-progress-games/SingleCombat/include/splashkit/point_drawing.h diff --git a/games/SingleCombat/include/splashkit/point_geometry.h b/in-progress-games/SingleCombat/include/splashkit/point_geometry.h similarity index 100% rename from games/SingleCombat/include/splashkit/point_geometry.h rename to in-progress-games/SingleCombat/include/splashkit/point_geometry.h diff --git a/games/SingleCombat/include/splashkit/quad_geometry.h b/in-progress-games/SingleCombat/include/splashkit/quad_geometry.h similarity index 100% rename from games/SingleCombat/include/splashkit/quad_geometry.h rename to in-progress-games/SingleCombat/include/splashkit/quad_geometry.h diff --git a/games/SingleCombat/include/splashkit/random.h b/in-progress-games/SingleCombat/include/splashkit/random.h similarity index 100% rename from games/SingleCombat/include/splashkit/random.h rename to in-progress-games/SingleCombat/include/splashkit/random.h diff --git a/games/SingleCombat/include/splashkit/rectangle_drawing.h b/in-progress-games/SingleCombat/include/splashkit/rectangle_drawing.h similarity index 100% rename from games/SingleCombat/include/splashkit/rectangle_drawing.h rename to in-progress-games/SingleCombat/include/splashkit/rectangle_drawing.h diff --git a/games/SingleCombat/include/splashkit/rectangle_geometry.h b/in-progress-games/SingleCombat/include/splashkit/rectangle_geometry.h similarity index 100% rename from games/SingleCombat/include/splashkit/rectangle_geometry.h rename to in-progress-games/SingleCombat/include/splashkit/rectangle_geometry.h diff --git a/games/SingleCombat/include/splashkit/resources.h b/in-progress-games/SingleCombat/include/splashkit/resources.h similarity index 100% rename from games/SingleCombat/include/splashkit/resources.h rename to in-progress-games/SingleCombat/include/splashkit/resources.h diff --git a/games/SingleCombat/include/splashkit/sound.h b/in-progress-games/SingleCombat/include/splashkit/sound.h similarity index 100% rename from games/SingleCombat/include/splashkit/sound.h rename to in-progress-games/SingleCombat/include/splashkit/sound.h diff --git a/games/SingleCombat/include/splashkit/splashkit.h b/in-progress-games/SingleCombat/include/splashkit/splashkit.h similarity index 100% rename from games/SingleCombat/include/splashkit/splashkit.h rename to in-progress-games/SingleCombat/include/splashkit/splashkit.h diff --git a/games/SingleCombat/include/splashkit/splashkit_starter.h b/in-progress-games/SingleCombat/include/splashkit/splashkit_starter.h similarity index 100% rename from games/SingleCombat/include/splashkit/splashkit_starter.h rename to in-progress-games/SingleCombat/include/splashkit/splashkit_starter.h diff --git a/games/SingleCombat/include/splashkit/sprites.h b/in-progress-games/SingleCombat/include/splashkit/sprites.h similarity index 100% rename from games/SingleCombat/include/splashkit/sprites.h rename to in-progress-games/SingleCombat/include/splashkit/sprites.h diff --git a/games/SingleCombat/include/splashkit/terminal.h b/in-progress-games/SingleCombat/include/splashkit/terminal.h similarity index 100% rename from games/SingleCombat/include/splashkit/terminal.h rename to in-progress-games/SingleCombat/include/splashkit/terminal.h diff --git a/games/SingleCombat/include/splashkit/text.h b/in-progress-games/SingleCombat/include/splashkit/text.h similarity index 100% rename from games/SingleCombat/include/splashkit/text.h rename to in-progress-games/SingleCombat/include/splashkit/text.h diff --git a/games/SingleCombat/include/splashkit/text_input.h b/in-progress-games/SingleCombat/include/splashkit/text_input.h similarity index 100% rename from games/SingleCombat/include/splashkit/text_input.h rename to in-progress-games/SingleCombat/include/splashkit/text_input.h diff --git a/games/SingleCombat/include/splashkit/timers.h b/in-progress-games/SingleCombat/include/splashkit/timers.h similarity index 100% rename from games/SingleCombat/include/splashkit/timers.h rename to in-progress-games/SingleCombat/include/splashkit/timers.h diff --git a/games/SingleCombat/include/splashkit/triangle_drawing.h b/in-progress-games/SingleCombat/include/splashkit/triangle_drawing.h similarity index 100% rename from games/SingleCombat/include/splashkit/triangle_drawing.h rename to in-progress-games/SingleCombat/include/splashkit/triangle_drawing.h diff --git a/games/SingleCombat/include/splashkit/triangle_geometry.h b/in-progress-games/SingleCombat/include/splashkit/triangle_geometry.h similarity index 100% rename from games/SingleCombat/include/splashkit/triangle_geometry.h rename to in-progress-games/SingleCombat/include/splashkit/triangle_geometry.h diff --git a/games/SingleCombat/include/splashkit/twitter.h b/in-progress-games/SingleCombat/include/splashkit/twitter.h similarity index 100% rename from games/SingleCombat/include/splashkit/twitter.h rename to in-progress-games/SingleCombat/include/splashkit/twitter.h diff --git a/games/SingleCombat/include/splashkit/types.h b/in-progress-games/SingleCombat/include/splashkit/types.h similarity index 100% rename from games/SingleCombat/include/splashkit/types.h rename to in-progress-games/SingleCombat/include/splashkit/types.h diff --git a/games/SingleCombat/include/splashkit/utils.h b/in-progress-games/SingleCombat/include/splashkit/utils.h similarity index 100% rename from games/SingleCombat/include/splashkit/utils.h rename to in-progress-games/SingleCombat/include/splashkit/utils.h diff --git a/games/SingleCombat/include/splashkit/vector_2d.h b/in-progress-games/SingleCombat/include/splashkit/vector_2d.h similarity index 100% rename from games/SingleCombat/include/splashkit/vector_2d.h rename to in-progress-games/SingleCombat/include/splashkit/vector_2d.h diff --git a/games/SingleCombat/include/splashkit/web.h b/in-progress-games/SingleCombat/include/splashkit/web.h similarity index 100% rename from games/SingleCombat/include/splashkit/web.h rename to in-progress-games/SingleCombat/include/splashkit/web.h diff --git a/games/SingleCombat/include/splashkit/web_server.h b/in-progress-games/SingleCombat/include/splashkit/web_server.h similarity index 100% rename from games/SingleCombat/include/splashkit/web_server.h rename to in-progress-games/SingleCombat/include/splashkit/web_server.h diff --git a/games/SingleCombat/include/splashkit/window_manager.h b/in-progress-games/SingleCombat/include/splashkit/window_manager.h similarity index 100% rename from games/SingleCombat/include/splashkit/window_manager.h rename to in-progress-games/SingleCombat/include/splashkit/window_manager.h diff --git a/in-progress-games/SingleCombat/myeasylog.log b/in-progress-games/SingleCombat/myeasylog.log new file mode 100644 index 00000000..e69de29b diff --git a/games/SingleCombat/program.cpp b/in-progress-games/SingleCombat/program.cpp similarity index 100% rename from games/SingleCombat/program.cpp rename to in-progress-games/SingleCombat/program.cpp diff --git a/games/SingleCombat/userinput.h b/in-progress-games/SingleCombat/userinput.h similarity index 100% rename from games/SingleCombat/userinput.h rename to in-progress-games/SingleCombat/userinput.h diff --git a/scripts/GameDownloadScript.py b/scripts/GameDownloadScript.py new file mode 100644 index 00000000..da20a7a8 --- /dev/null +++ b/scripts/GameDownloadScript.py @@ -0,0 +1,40 @@ +import os +from requests import get +from zipfile import ZipFile +from io import BytesIO +from shutil import move, rmtree +from tarfile import open + +#Get the zip +git_url = "https://github.com/thoth-tech/arcade-games/archive/refs/heads/main.zip" +r = get(git_url) +z = ZipFile(BytesIO(r.content)) +z.extractall(r"/home/deakin/Games/LaunchScripts/") + +#move to games folder +sourceDir = r"/home/deakin/Games/LaunchScripts/arcade-games-main/compiled-games/" +gameFolder = r"/home/deakin/Games/LaunchScripts/" +for file in os.listdir(sourceDir): + src_path = os.path.join(sourceDir, file) + dst_path = os.path.join(gameFolder, file) + move(src_path, dst_path) + +#Remove the cloned repo file +rmtree(r"/home/deakin/Games/LaunchScripts/arcade-games-main/") +#Extract games +for folder in os.listdir(gameFolder): + if os.path.isdir(gameFolder+folder): + for file in os.listdir(gameFolder+folder): + filePath = gameFolder+folder+"/"+file + if os.path.isdir(filePath): + continue + if ".tar.gz" in file: + try: + print("Extracting: " + file) + tar = open(filePath) + tar.extractall(gameFolder+folder+"/") + tar.close() + #Remove the old tar file + os.remove(filePath) + except: + print("Failed to decompress " + file)