Merge branch 'main' of https://git.ale-pri.com/TetrisNerd/jminos

README.md

@@ -18,7 +18,8 @@ If you want to know more details about the generation of polyominoes, [check the
 
 ## Features
 
-- Every polyominoes from size 1 to 15, selectable as you wish, with customizable propotionnality for each size!
+- Every polyominoes up to pentedecaminoes!
+- 7bag with proportionnality for each polyomino size!
 - Customizable keybinds!
 - 0° rotations!
 - AutoRS as the Rotation System!

src/GraphicalUI/AppMenus/InfoAppMenu.cpp

@@ -10,12 +10,13 @@
 
 InfoAppMenu::InfoAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow) :
     AppMenu(menuStack, settings, renderWindow),
-    playerCursor({4}),
+    playerCursor({INFO_SECTIONS_COUNT}),
     sectionsName(
         "< ABOUT >",
+        "< PIECES TYPES >",
+        "< 0 DEGREES ROTATIONS >",
         "< ROTATION SYSTEM >",
-        "< SCORING >",
-        "< 0 DEGREES ROTATIONS >"
+        "< SCORING >"
     ),
     sectionsContent(
         "This game is written in C++,\n"
@@ -27,6 +28,25 @@ InfoAppMenu::InfoAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<S
         "to them in any ways.\n"
         "Current version: beta.",
 
+        "There is multiple pieces type in\n"
+        "the selection screen. Use theses\n"
+        "categories for size of at least 7.\n"
+        "Convex, Holeless and Others are\n"
+        "all mutually exclusive.\n"
+        "Others have holes inside them, and\n"
+        "Convex are presumably easier to\n"
+        "play with than Holeless.",
+
+        "This games introduces 0 degrees\n"
+        "rotations, which work by simpling\n"
+        "moving the piece down and kicking\n"
+        "it as is, allowing for new kinds\n"
+        "of kicks.\n"
+        "As a leniency mechanic, when a\n"
+        "piece spawns it will automatically\n"
+        "try a 0 degrees rotations if it\n"
+        "spawned inside a wall.",
+
         "This game uses its own\n"
         "Rotation Sytem, called AutoRS.\n"
         "The rotation center is always the\n"
@@ -46,17 +66,7 @@ InfoAppMenu::InfoAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<S
         "and doubles the score gained.\n"
         "A spin is detected when the piece is\n"
         "locked in place, a mini-spin simply\n"
-        "when the last move was a kick.",
-
-        "This games introduces 0 degrees\n"
-        "rotations, which work by simpling\n"
-        "moving the piece down and kicking\n"
-        "it as is, allowing for new kinds\n"
-        "of kicks.\n"
-        "As a leniency mechanic, when a\n"
-        "piece spawns it will automatically\n"
-        "try a 0 degrees rotations if it\n"
-        "spawned inside a wall."
+        "when the last move was a kick."
     ) {
 
 }

src/GraphicalUI/AppMenus/InfoAppMenu.h

@@ -7,12 +7,14 @@
 #include <memory>
 #include <SFML/Graphics.hpp>
 
+static const int INFO_SECTIONS_COUNT = 5;
+
 
 class InfoAppMenu : public AppMenu {
     private:
         PlayerCursor playerCursor;
-        sf::String sectionsName[4];
-        sf::String sectionsContent[4];
+        sf::String sectionsName[INFO_SECTIONS_COUNT];
+        sf::String sectionsContent[INFO_SECTIONS_COUNT];
 
     public:
         InfoAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow);