Merge pull request #12 from bigb4321/master

More to come...

Author: mentoster

README.md

@@ -18,15 +18,20 @@ Welcome to **Flipper Hero**, an engaging typing practice game ported for the Fli
 
 ## Screenshots
 
-![1](./screenshots/flipper_hero_1.png)
+![1](./screenshots/Screenshot-1.png)
 
-![2](./screenshots/flipper_hero_2.png)
+![2](./screenshots/Screenshot-2.png)
 
-![3](./screenshots/flipper_hero_3.png)
+![3](./screenshots/Screenshot-3.png)
 
+![4](./screenshots/Screenshot-4.png)
 ## Introduction
 
 **Flipper Hero** is inspired by the beloved minigame "Stratagem Hero, " found in the "Helldivers 2" universe. Situated on your Ship, this game becomes a crucial part of your journey, allowing you to practice typing Stratagem Codes flawlessly. The better you perform, the higher your score!
+Flipper Hero has been updated to more closely resemble its inspiration, Stratagem Hero from Helldivers 2.
+A pause menu has been added with a few settings. It can be accessed by pressing the "BACK" button. Settings can be saved by pressing the "OK" button in the settings menu.
+The "New Strgms:" option in the settings menu enables the inclusion of stratagems not in Stratagem Hero. This includes stratagems from warbonds, and mission-specific stratagems.
+
 
 ## Features
 

application.fam

@@ -9,7 +9,7 @@ App(
     ],
     stack_size=1 * 1024,
     order=10,
-    fap_version="1.3",
+    fap_version="1.4",
     fap_icon="icons/hex_10px.png",
     fap_icon_assets="icons",
     fap_category="Games",

data/data.h

@@ -1,5 +1,17 @@
 #include <input/input.h>
+#include <gui/icon.h>
+#include <gui/canvas.h>
+
+// I'm using the code for sound from Doom by MMX @ https://github.com/xMasterX/all-the-plugins/tree/dev/base_pack/doom
+// Thanks for the permission, MMX!
+#include "../helpers/sound.h"
+
+
 #pragma once
+// Likelyhood for special rounds to force a stratagem to match the theme, out of 10.
+#define SPECIAL_ROUND_SELECTION_CHANCE 75
+#define MENU_OPTION_COUNT 3
+#define SOUND
 typedef enum {
     EventTypeTick,
     EventTypeKey,
@@ -10,21 +22,89 @@ typedef struct {
     InputEvent input;
 } PluginEvent;
 
+typedef struct {
+    int32_t score;
+    int32_t round;
+
+    // bool states[2];
+} Record;
+
+typedef enum {
+    SpecialRoundNone,
+    SpecialRoundOrbital,
+    SpecialRoundEagle,
+    SpecialRoundBackpack,
+    SpecialRoundWeapon,
+} SpecialRound;
+
+typedef struct {
+    bool unfaithful; // For adherence to original Stratagem Hero. If true, removes warbond stratagems.
+    bool enable_sound; // Whether or not to play jingles at the ends of games/rounds
+    bool center_queue; // If true, draw the current stratagem in the middle. If false, draw it offset to the left.
+} Config;
+
 typedef struct {
     FuriMutex* mutex;
+
+    // ARROW HANDLING
     char arrowDirections[8]; // Store directions of up to 8 arrows
     bool arrowFilled[8]; // Track whether each arrow is filled
     int numArrows; // Number of arrows currently active
     int nextArrowToFill; // Index of the next arrow to fill
+    char seq_buf[9]; // Buffer for arrow sequences
+
+    // QUEUE
+    int queue_spot; // Current place in the stratgaem queue
+    int stratagem_queue[20]; // 20 long even though there will only be a max of 16 stratagems. I honstly don't know why i did this lol
+    SpecialRound special_round;
+
+    char name_buf[32]; // Buffer for stratagem name
+
+    // GAME STATS
     int score;
     int round;
     int timer;
-    int32_t record_score;
-    int32_t record_round;
+    Record* record; // High score and high round
+
+    // MENU HANDLING
+    int menu_spot;
+    Config* config;
+
+
+    // MARQUEE
+    bool init_marquee;
+    bool do_marquee;
+    int marquee_data[3];
+    // 0: Time at stratagem start
+    // 1: Current offset
+    // 2: Marquee spacing
+
+    // END OF ROUND BONUSES
+    bool perfect;
+    int bonuses[3]; // round bonus at 0, time bonus at 1, perfect bonus at 2.
+
+    // GAME STATE
+    bool allowMenuInput;
+    bool allowOkInput;
+    bool allowPauseInput;
+    bool isGamePaused;
     bool isGameStarted;
+    bool isScoreScreen;
+    bool isPreRound;
+    bool isRoundOver;
     bool isGameOver;
+
+    //Music stuff
+#ifdef SOUND
+    MusicPlayer* music_instance;
+    bool playing_sound;
+    bool gameOverSoundPlayed;
+    int mus_timer;
+#endif
 } PluginState;
 
+
+
 typedef enum {
     ArrowDirectionUp,
     ArrowDirectionRight,

docs/README.md

@@ -1,6 +1,10 @@
 ## Flipper Hero Game
 
 Flipper Hero is a typing game that challenges you to improve your typing skills by inputting codes. Track your high score and challenge yourself to beat it with each attempt.
+Flpper Hero has been updated to more closely resemble its inspiration, Stratagem Hero from Helldivers 2.
+A pause menu has been added with a few settings. It can be accessed by pressing the "BACK" button. Settings can be saved by pressing the "OK" button in the settings menu.
+The "New Strgms:" option in the settings menu enables the inclusion of stratagems not in Stratagem Hero. This includes stratagems from warbonds, and mission-specific stratagems.
+
 
 ## Features
 - **Typing Practice:** Enhance your typing skills by inputting codes.

docs/changelog.md

@@ -1,3 +1,28 @@
+## v1.4
+- Updated for SDK version 1.4.3
+- Added all stratagems (as of Helldivers 2 version 1.005.001)
+- Created and implemented stratagem icons and stratagem queue
+- Replaced randomly-generated sequences with aforementioned stratagems.
+- Added stratagem name display.
+- Implemented distinct rounds to more closely resemble Stratagem Hero
+- Added end-of-round bonuses
+- Added "special rounds" with accompanying splash text before them
+- Added saved high score
+- Updated pre-game and game over screens to show high score (And high round on game over screen)
+- Marquee effect on names that don't fit in the frame
+- Added jingles at game over/end of rounds
+- Added settings menu with the following options:
+- - Whether or not to use stratagems that aren't in Stratagem Hero
+- - Enable/disable sound
+- - Where to draw the current stratagem (center, or offset to the left)
+- Added ability to save settings
+- Reorganized some code structure:
+- - Moved rendering code to its own file
+- - Created dedicated files for stratagem data
+- - Moved input handling from flipper_hero_app() to its own function
+- Used sound code from Doom by xMasterX at https://github.com/xMasterX/all-the-plugins/tree/dev/base_pack/doom
+- Separate files are saved for high score storage and config storage. I did this because it was a much bigger headache than using one file for both
+
 ## v1.3
 
 - Updated for SDK version 1.3.0-rc f7 compatibility