Added a fast inventory mode option.

Author: Espyo

game_data/base/gui/options_menu_controls.txt

@@ -30,20 +30,25 @@ hardcoded_items{
 		description=Inventory item shortcuts menu button.
 	}
 	leader_cursor_mouse{
-		center=50.0000 61.0000
-		size=70.0000 10.0000
+		center=50.0000 56.0000
+		size=70.0000 8.0000
 		description=Checkbox for whether the leader cursor is controlled with the mouse.
 	}
 	leader_cursor_speed{
-		center=50.0000 73.0000
-		size=70.0000 10.0000
+		center=50.0000 66.0000
+		size=70.0000 8.0000
 		description=Leader cursor speed picker.
 	}
 	auto_throw{
-		center=50.0000 85.0000
-		size=70.0000 10.0000
+		center=50.0000 76.0000
+		size=70.0000 8.0000
 		description=Auto-throw mode picker.
 	}
+	fast_inventory{
+		center=50.0000 86.0000
+		size=70.0000 8.0000
+		description=Fast inventory mode checkbox.
+	}
 	tooltip{
 		center=50.0000 96.0000
 		size=96.0000 4.0000

readme.md

@@ -95,7 +95,7 @@ Depending on the area you select, you can either explore around freely without a
 
 * Auditory features: [Multiple Volume Controls](https://accessiblegames.com/accessibility-tags/multiple-volume-controls/)
 * Input features: [Full Input Remapping](https://accessiblegames.com/accessibility-tags/full-remapping/), [Playable with Buttons Only](https://accessiblegames.com/accessibility-tags/buttons-only-option/), [Playable with Keyboard Only](https://accessiblegames.com/accessibility-tags/keyboard-only-option/), [Playable with Mouse Only](https://accessiblegames.com/accessibility-tags/mouse-only-option/), [Playable without Button Holds](https://accessiblegames.com/accessibility-tags/playable-without-button-holds/), [Stick Inversion](https://accessiblegames.com/accessibility-tags/stick-inversion/)
-* Visual features: [Camera Confort](https://accessiblegames.com/accessibility-tags/camera-comfort/)
+* Visual features: [Camera Comfort](https://accessiblegames.com/accessibility-tags/camera-comfort/)
 
 ## Get the latest version
 

source/documents/todo.txt

@@ -6,15 +6,14 @@ Current tasks (tasks being worked on, but not yet committed)
 
 Next tasks (roughly sorted most important first)
     --- To fix ---
+    Having a Pikmin follow a Snagret as a leader causes a crash
+    If two keyframes have the same value, the visualizer in the editor will show a broken line
     Binding the zoom button to the Deck's right trigger STILL causes a bunch of actions when pressed
     It's impossible to go on the inner triangle on DEV Lab at 1465, 370
 
     --- 1.1.0 ---
+    Dismiss sound should be a higher pitch when you press again to dismiss all
     Swarming jingle
-    GUI things
-        Spatial navigation
-            Logic to remember where it came from
-            Logic to check that, if you could get to this item from the current item more effectively (lesser score) with a different direction, then skip it
     Controls improvements
         Controls manager
             Implement sub-schemes, so a game can have a scheme for when you're driving, another for when you're on foot, etc.
@@ -39,8 +38,6 @@ Next tasks (roughly sorted most important first)
                 If the selected control scheme uses controllers, the player can choose which controllers fill in the controller placeholders of that scheme
                     Write the controller's names, given by Allegro
         An inventory system
-            A menu speed option: "slow" means you press the button to open it, then press the confirm button to select (and the back button to cancel). "Fast" means you hold the button to keep it open, let go to select.
-                When you select, should it set it as the aforementioned "standby" item, use it, or do both?
             Update the help menu
         Check the controller's name, and if it matches the "Switch Pro Controller" or whatever the name used for the Joy-Con is, the input icons should show the name of the button instead of a number
         If an action has multiple binds, the icon to show should prioritize controller inputs if the last player input was a controller (for analog sticks only if > 0.5), and keyboard/mouse otherwise
@@ -57,11 +54,13 @@ Next tasks (roughly sorted most important first)
             Logic to freeze all enemies in the water
             Logic to call the Pikmin out and thawing
         Ice hazard for Pikmin attacks, and ice hazard for enemy attacks
+        Ice gates
     Glow Pikmin
         The ability for Pikmin to teleport to the current leader if they've been idling for a bit
         Onions should be able to specify they can't be interacted with, so Lumiknolls can be Onions under the hood
         Glow Pellets should be internally pellets, but only able to be received by Lumiknolls
         Glowmob?
+    Puffstool and mushroom Pikmin
     Mob rotation should have acceleration too
     A way to start a timer after a random amount of time, based on the coordinates; this allows stuff like a group of fire geysers to start spitting fire at different times
     [NEEDS BRAINSTORMING] Re-think how missions work
@@ -74,7 +73,7 @@ Next tasks (roughly sorted most important first)
     Areas should be able to set their own rules, overwriting config.txt. This should be shown in the area details
         What upgrades are on
         Maximum Pikmin in field
-        If Onions work automatically, by ejecting Pikmin whenever the amount on field is not at max (a la Bingo Battle)
+        If Onions work automatically, by ejecting Pikmin whenever the amount on field is no longer at max (a la Bingo Battle)
         If Onions spit out fully grown Pikmin instead of seeds (a la Dandori Battle)
         If Onions should pop new seeds when an extinction happen or if they should let the extinction happen
     Floors-over-floors; mostly for bridges
@@ -509,23 +508,25 @@ Misc things (so I don't forget)
         Option to pause the game if the window is not focused
         An option that changes the font to something easier to read, and decreases the effect of GUI text juice grow
     Mechanics
-        Lock-on
-            Auto [PIKMIN 4]
-                Makes the leader cursor snap to the nearest object (or hitbox?) in-game
-                The mouse cursor, i.e. the spinning flower, should always show where the OS mouse cursor is. It's just the leader's cursor, i.e. the outer shell, that locks
-                An option to set the radius in which auto lock-on applies
-                An option to toggle this on or off
-            Manual [PIKMIN 3][PIKMIN 4]
+        Cursor
+            The mouse cursor, i.e. the spinning flower, should always show where the OS mouse cursor is, 100% of the time.
+            Cursor snap [PIKMIN 4]
+                Off: normal behavior
+                On: if the cursor is close to an object (or hitbox?), it automatically moves there. If that thing moves far enough away, the cursor unsnaps. There should be some indicator of the cursor's "real, under-the-hood" position and the cursor's "snapped, final" position; the line connecting to the leader should go to the snap position
+                Options to set the radius
+            Lock-on [PIKMIN 3] [PIKMIN 4]
                 A button that locks the leader cursor in place
                 If on the floor, it just locks the leader cursor there
-                If on an enemy, it locks to that position (hitbox + offset) of the enemy, like its back
+                If on an enemy, it locks to that position (hitbox + offset) of the enemy, like its back, and follows it
                 While locked, movement on the mouse or gyro (if gyro is ever added) is ignored -- this allows the player to recenter their peripheral
                 An option in the options for it to either lock with holding the button, or toggling
-            Throwing or charging (or dismissing) Pikmin onto a locked-on target should make them work exclusively on that
+                Throwing or charging (or dismissing) Pikmin onto a locked-on target should make them work exclusively on that
+            Throw locking? [PIKMIN 4]
+                When you're throwing Pikmin at something, the game momentarily stops you from throwing more if you already threw the required amount
         Charge
-            Allow the player to pick between full-squad charging or standby type charging
-            Allow the player to pick between placing only the minimum amount of Pikmin necessary onto the task (P4) or maximum (P3)
-                Hitting charge again should use the maximum
+            Allow the player to pick between full-squad charging or standby type charging; hitting the button again within a time limit charges the full squad however
+                Make the second charge sound higher pitched to indicate this
+            Allow the player to pick between placing only the minimum amount of Pikmin necessary onto the task (P4) or maximum (P3); hitting charge again should use the maximum
         Half-whistle
             Options for whether whistling workers brings them to you right away, brings the excess to you while keeping the bare minimum in the confirming state, or put all whistled Pikmin in the confirming state (whistling any Pikmin in the confirming state always brings them to you)
         Water depth (thanks ThyCheshireCat)
@@ -839,6 +840,7 @@ Tasks for later on (I might never implement these)
         When it is opened, it should fade into view, as well as zoom out, to give the impression that the camera is moving up to show a larger view, from the point the leader is. Maybe only for story mode, and only the first time you do it?
         Survey drone? It'd just be a way for the player to view the area with free-cam (same as if there are no players)
             The ability to place beacons?
+            Buttons to disable the HUD and other niceties for players wanting to use it just to take photos
     Petrified enemies should break open when defeated
         Maybe define loot tables somewhere, like "standard", "boss", "weakling", etc. Enemy types use the "standard" one by default (which one is the default should be specified somewhere), but can choose a different one
             Maybe individual enemy instances in an area can also specify their own loot table?

source/source/content/other/gui.cpp

@@ -1274,7 +1274,7 @@ bool GuiManager::handlePlayerAction(const Inpution::Action& action) {
 
     } case PLAYER_ACTION_TYPE_MENU_OK: {
         if(focusedItem && isDown) {
-            focusedItem->activate(Point(LARGE_FLOAT));
+            focusedItem->activate();
             autoRepeater.start();
         } else if(!isDown) {
             autoRepeater.stop();
@@ -1283,7 +1283,7 @@ bool GuiManager::handlePlayerAction(const Inpution::Action& action) {
 
     } case PLAYER_ACTION_TYPE_MENU_BACK: {
         if(backItem && isDown) {
-            backItem->activate(Point(LARGE_FLOAT));
+            backItem->activate();
         }
         break;
 
@@ -1593,7 +1593,7 @@ bool GuiManager::tick(float deltaT) {
         focusedItem->canAutoRepeat && focusedItem->onActivate
     ) {
         for(size_t r = 0; r < autoRepeatTriggers; r++) {
-            focusedItem->activate(Point(LARGE_FLOAT));
+            focusedItem->activate();
         }
     }
 

source/source/content/other/gui.h

@@ -375,7 +375,7 @@ class GuiItem {
 
     explicit GuiItem(bool focusable = false);
     virtual ~GuiItem() = default;
-    bool activate(const Point& cursorPos);
+    bool activate(const Point& cursorPos = Point());
     bool addChild(GuiItem* item);
     bool deleteAllChildren();
     float getChildrenSpan(bool horizontal = false) const;

source/source/content/other/mob_script.cpp

@@ -491,7 +491,7 @@ size_t fixStates(
                         stateIdx = INVALID;
                         game.errors.report(
                             "State \"" + state->name +
-                            "\" of the mob category \"" + mt->category->name +
+                            "\" of the mob type \"" + mt->name +
                             "\" has an action to switch to an "
                             "unknown state: \"" + stateName + "\"!",
                             nullptr

source/source/core/options.cpp

@@ -138,6 +138,9 @@ namespace CONTROLS_D {
 //Default value for the auto-throw mode.
 const AUTO_THROW_MODE AUTO_THROW = AUTO_THROW_MODE_OFF;
 
+//Default value for the fast inventory mode.
+const bool FAST_INVENTORY = false;
+
 //Default value for the leader cursor speed.
 const float LEADER_CURSOR_SPEED = 500.0f;
 
@@ -403,6 +406,7 @@ void Options::loadFromDataNode(DataNode* file) {
         cRS.set("cursor_speed", controls.leaderCursorSpeed);
 
         cRS.set("auto_throw_mode", autoThrowModeChar);
+        cRS.set("fast_inventory", controls.fastInventory);
         cRS.set("leader_cursor_speed", controls.leaderCursorSpeed);
 
         for(unsigned char p = 0; p < MAX_PLAYERS; p++) {
@@ -651,6 +655,7 @@ void Options::saveToDataNode(DataNode* file) const {
         GetterWriter cGW(file->addNew("controls"));
 
         cGW.write("auto_throw_mode", controls.autoThrowMode);
+        cGW.write("fast_inventory", controls.fastInventory);
         cGW.write("leader_cursor_speed", controls.leaderCursorSpeed);
 
         for(unsigned char p = 0; p < MAX_PLAYERS; p++) {

source/source/core/options.h

@@ -111,6 +111,7 @@ extern const AreaEditor::VIEW_MODE VIEW_MODE;
 
 namespace CONTROLS_D {
 extern const AUTO_THROW_MODE AUTO_THROW;
+extern const bool FAST_INVENTORY;
 extern const float LEADER_CURSOR_SPEED;
 extern const bool MOUSE_MOVES_LEADER_CURSOR[MAX_PLAYERS];
 extern const bool MOUSE_MOVES_LEADER[MAX_PLAYERS];
@@ -301,6 +302,9 @@ struct Options {
 
         //Auto-throw mode.
         AUTO_THROW_MODE autoThrowMode = CONTROLS_D::AUTO_THROW;
+
+        //Fast inventory mode.
+        bool fastInventory = CONTROLS_D::FAST_INVENTORY;
 
         //Inventory item shortcuts.
         string inventoryShortcuts[MAX_PLAYERS][4];

source/source/game_state/gameplay/inventory.cpp

@@ -128,6 +128,19 @@ bool Inventory::handleAllegroEvent(const ALLEGRO_EVENT& ev) {
  * @return Whether it got handled.
  */
 bool Inventory::handlePlayerAction(const Inpution::Action& action) {
+    if(
+        action.actionTypeId == PLAYER_ACTION_TYPE_INVENTORY &&
+        action.value < 0.5f &&
+        game.options.controls.fastInventory
+    ) {
+        GuiItem* focusedItem = gui.getFocusedItem();
+        if(focusedItem) {
+            focusedItem->activate();
+        } else {
+            close();
+        }
+        return true;
+    }
     return gui.handlePlayerAction(action);
 }
 

source/source/game_state/gameplay/onion_menu.cpp

@@ -799,17 +799,17 @@ void OnionMenu::handlePlayerAction(const Inpution::Action& action) {
     switch(action.actionTypeId) {
     case PLAYER_ACTION_TYPE_ONION_CHANGE_10: {
         if(action.value >= 0.5f) {
-            changeTenButton->activate(Point());
+            changeTenButton->activate();
         }
         break;
     } case PLAYER_ACTION_TYPE_ONION_SELECT_ALL: {
         if(action.value >= 0.5f) {
-            selectAllButton->activate(Point());
+            selectAllButton->activate();
         }
         break;
     } case PLAYER_ACTION_TYPE_MENU_OK: {
         if(action.value >= 0.5f) {
-            okButton->activate(Point());
+            okButton->activate();
         }
         break;
     }