- Added Arrow-Buttons Max-Click feature

Author: fenyo1

src/Basescape/CraftEquipmentState.cpp

@@ -19,6 +19,7 @@
 #include "CraftEquipmentState.h"
 #include <sstream>
 #include <algorithm>
+#include "../Engine/Action.h"
 #include "../Engine/Game.h"
 #include "../Engine/Timer.h"
 #include "../Resource/ResourcePack.h"
@@ -115,8 +116,10 @@ CraftEquipmentState::CraftEquipmentState(Game *game, Base *base, size_t craft) :
 	_lstEquipment->setMargin(8);
 	_lstEquipment->onLeftArrowPress((ActionHandler)&CraftEquipmentState::lstEquipmentLeftArrowPress);
 	_lstEquipment->onLeftArrowRelease((ActionHandler)&CraftEquipmentState::lstEquipmentLeftArrowRelease);
+	_lstEquipment->onLeftArrowClick((ActionHandler)&CraftEquipmentState::lstEquipmentLeftArrowClick);
 	_lstEquipment->onRightArrowPress((ActionHandler)&CraftEquipmentState::lstEquipmentRightArrowPress);
 	_lstEquipment->onRightArrowRelease((ActionHandler)&CraftEquipmentState::lstEquipmentRightArrowRelease);
+	_lstEquipment->onRightArrowClick((ActionHandler)&CraftEquipmentState::lstEquipmentRightArrowClick);
 
 	int row = 0;
 	std::vector<std::string> items = _game->getRuleset()->getItemsList();
@@ -217,7 +220,7 @@ void CraftEquipmentState::btnOkClick(Action *action)
 void CraftEquipmentState::lstEquipmentLeftArrowPress(Action *action)
 {
 	_sel = _lstEquipment->getSelectedRow();
-	_timerLeft->start();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerLeft->start();
 }
 
 /**
@@ -226,7 +229,55 @@ void CraftEquipmentState::lstEquipmentLeftArrowPress(Action *action)
  */
 void CraftEquipmentState::lstEquipmentLeftArrowRelease(Action *action)
 {
-	_timerLeft->stop();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerLeft->stop();
+}
+
+/**
+ * Moves all the items to the base on right-click.
+ * @param action Pointer to an action.
+ */
+void CraftEquipmentState::lstEquipmentLeftArrowClick(Action *action)
+{
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+  {
+	  Craft *c = _base->getCrafts()->at(_craft);
+	  RuleItem *item = _game->getRuleset()->getItem(_items[_sel]);
+	  int cQty = 0;
+	  if (item->isFixed())
+	  {
+		  cQty = c->getVehicleCount(_items[_sel]);
+      if (cQty > 0)
+      {
+			  while (cQty > 0)
+        {
+          RuleItem *ammo = _game->getRuleset()->getItem(item->getCompatibleAmmo()->front());
+			    for (std::vector<Vehicle*>::iterator i = c->getVehicles()->begin(); i != c->getVehicles()->end(); ++i)
+			    {
+				    if ((*i)->getRules() == item)
+				    {
+					    _base->getItems()->addItem(ammo->getType(), (*i)->getAmmo());
+					    delete (*i);
+					    c->getVehicles()->erase(i);
+					    break;
+				    }
+			    }
+			    _base->getItems()->addItem(_items[_sel]);
+          cQty = c->getVehicleCount(_items[_sel]);
+        }
+        updateQuantity();
+      }
+	  }
+	  else
+	  {
+		  cQty = c->getItems()->getItem(_items[_sel]);
+      if (cQty > 0)
+      {
+			  _base->getItems()->addItem(_items[_sel], cQty);
+			  c->getItems()->removeItem(_items[_sel], cQty);
+        updateQuantity();
+      }
+	  }
+  }
 }
 
 /**
@@ -236,7 +287,7 @@ void CraftEquipmentState::lstEquipmentLeftArrowRelease(Action *action)
 void CraftEquipmentState::lstEquipmentRightArrowPress(Action *action)
 {
 	_sel = _lstEquipment->getSelectedRow();
-	_timerRight->start();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerRight->start();
 }
 
 /**
@@ -245,7 +296,57 @@ void CraftEquipmentState::lstEquipmentRightArrowPress(Action *action)
  */
 void CraftEquipmentState::lstEquipmentRightArrowRelease(Action *action)
 {
-	_timerRight->stop();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerRight->stop();
+}
+
+/**
+ * Moves all the items (as much as possible) to the craft on right-click.
+ * @param action Pointer to an action.
+ */
+void CraftEquipmentState::lstEquipmentRightArrowClick(Action *action)
+{
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+  {
+	  Craft *c = _base->getCrafts()->at(_craft);
+	  RuleItem *item = _game->getRuleset()->getItem(_items[_sel]);
+    int bqty = _base->getItems()->getItem(_items[_sel]);
+    if (bqty > 0)
+	  {
+		  // Do we need to convert item to vehicle?
+		  if (item->isFixed())
+		  {
+			  // Check if there's enough room
+			  int room = std::min(c->getRules()->getVehicles() - c->getNumVehicles(), c->getSpaceAvailable() / 4);
+        if (room > 0)
+			  {
+				  RuleItem *ammo = _game->getRuleset()->getItem(item->getCompatibleAmmo()->front());
+				  int baqty = _base->getItems()->getItem(ammo->getType());
+				  int vehiclesCount = std::min(std::min(bqty, room), baqty);
+          if (vehiclesCount > 0)
+				  {
+					  int newAmmoPerVehicle = std::min(baqty / vehiclesCount, ammo->getClipSize());;
+            int remainder = baqty - (vehiclesCount * newAmmoPerVehicle);
+            if (ammo->getClipSize() == newAmmoPerVehicle) remainder = 0;
+            int newAmmo;
+            for (int i=0; i < vehiclesCount; ++i)
+            {
+              newAmmo = newAmmoPerVehicle;
+              if (i<remainder) ++newAmmo;
+					    c->getVehicles()->push_back(new Vehicle(item, newAmmo));
+					    _base->getItems()->removeItem(ammo->getType(), newAmmo);
+					    _base->getItems()->removeItem(_items[_sel]);
+            }
+				  }
+			  }
+		  }
+		  else
+		  {
+			  _base->getItems()->removeItem(_items[_sel],bqty);
+			  c->getItems()->addItem(_items[_sel],bqty);
+		  }
+		  updateQuantity();
+	  }
+  }
 }
 
 /**

src/Basescape/CraftEquipmentState.h

@@ -64,10 +64,14 @@ class CraftEquipmentState : public State
 	void lstEquipmentLeftArrowPress(Action *action);
 	/// Handler for releasing a Move Left arrow in the list.
 	void lstEquipmentLeftArrowRelease(Action *action);
+	/// Handler for clicking a Move Left arrow in the list.
+	void lstEquipmentLeftArrowClick(Action *action);
 	/// Handler for pressing a Move Right arrow in the list.
 	void lstEquipmentRightArrowPress(Action *action);
 	/// Handler for releasing a Move Right arrow in the list.
 	void lstEquipmentRightArrowRelease(Action *action);
+	/// Handler for clicking a Move Right arrow in the list.
+	void lstEquipmentRightArrowClick(Action *action);
 	/// Moves an item to the base.
 	void moveLeft();
 	/// Moves an item to the craft.

src/Basescape/ManufactureInfoState.cpp

@@ -22,6 +22,7 @@
 #include "../Interface/Text.h"
 #include "../Interface/TextList.h"
 #include "../Interface/ArrowButton.h"
+#include "../Engine/Action.h"
 #include "../Engine/Game.h"
 #include "../Engine/Language.h"
 #include "../Engine/Palette.h"
@@ -145,18 +146,22 @@ void ManufactureInfoState::buildUi()
 	_btnEngineerUp->setColor(Palette::blockOffset(15)+1);
 	_btnEngineerUp->onMousePress((ActionHandler)&ManufactureInfoState::moreEngineerPress);
 	_btnEngineerUp->onMouseRelease((ActionHandler)&ManufactureInfoState::moreEngineerRelease);
+	_btnEngineerUp->onMouseClick((ActionHandler)&ManufactureInfoState::moreEngineerClick, 0);
 
 	_btnEngineerDown->setColor(Palette::blockOffset(15)+1);
 	_btnEngineerDown->onMousePress((ActionHandler)&ManufactureInfoState::lessEngineerPress);
 	_btnEngineerDown->onMouseRelease((ActionHandler)&ManufactureInfoState::lessEngineerRelease);
+	_btnEngineerDown->onMouseClick((ActionHandler)&ManufactureInfoState::lessEngineerClick, 0);
 
 	_btnUnitUp->setColor(Palette::blockOffset(15)+1);
 	_btnUnitUp->onMousePress((ActionHandler)&ManufactureInfoState::moreUnitPress);
 	_btnUnitUp->onMouseRelease((ActionHandler)&ManufactureInfoState::moreUnitRelease);
+	_btnUnitUp->onMouseClick((ActionHandler)&ManufactureInfoState::moreUnitClick, 0);
 
 	_btnUnitDown->setColor(Palette::blockOffset(15)+1);
 	_btnUnitDown->onMousePress((ActionHandler)&ManufactureInfoState::lessUnitPress);
 	_btnUnitDown->onMouseRelease((ActionHandler)&ManufactureInfoState::lessUnitRelease);
+	_btnUnitDown->onMouseClick((ActionHandler)&ManufactureInfoState::lessUnitClick, 0);
 
 	_txtUnitUp->setColor(Palette::blockOffset(15)+1);
 	_txtUnitUp->setText(_game->getLanguage()->getString("STR_INCREASE_UC"));
@@ -249,7 +254,7 @@ void ManufactureInfoState::setAssignedEngineer()
 */
 void ManufactureInfoState::moreEngineerPress(Action * action)
 {
-	_timerMoreEngineer->start();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerMoreEngineer->start();
 }
 
 /**
@@ -258,7 +263,28 @@ void ManufactureInfoState::moreEngineerPress(Action * action)
 */
 void ManufactureInfoState::moreEngineerRelease(Action * action)
 {
-	_timerMoreEngineer->stop();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerMoreEngineer->stop();
+}
+
+/**
+ * Allocate all engineers
+ * @param action a pointer to an Action
+*/
+void ManufactureInfoState::moreEngineerClick(Action * action)
+{
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+	{
+	  int assigned = _production->getAssignedEngineers();
+	  int availableEngineer = _base->getAvailableEngineers();
+	  int availableWorkSpace = _base->getFreeWorkshops();
+	  if (availableEngineer > 0 && availableWorkSpace > 0)
+	  {
+		  int change=std::min(availableEngineer, availableWorkSpace);
+      _production->setAssignedEngineers(assigned+=change);
+		  _base->setEngineers(_base->getEngineers()-change);
+		  setAssignedEngineer();
+	  }
+	}
 }
 
 /**
@@ -267,7 +293,7 @@ void ManufactureInfoState::moreEngineerRelease(Action * action)
 */
 void ManufactureInfoState::lessEngineerPress(Action * action)
 {
-	_timerLessEngineer->start();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerLessEngineer->start();
 }
 
 /**
@@ -276,7 +302,25 @@ void ManufactureInfoState::lessEngineerPress(Action * action)
 */
 void ManufactureInfoState::lessEngineerRelease(Action * action)
 {
-	_timerLessEngineer->stop();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerLessEngineer->stop();
+}
+
+/**
+ * Allocate 0 engineers
+ * @param action a pointer to an Action
+*/
+void ManufactureInfoState::lessEngineerClick(Action * action)
+{
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+	{
+	  int assigned = _production->getAssignedEngineers();
+	  if (assigned > 0)
+	  {
+		  _production->setAssignedEngineers(0);
+		  _base->setEngineers(_base->getEngineers()+assigned);
+		  setAssignedEngineer();
+	  }
+	}
 }
 
 /**
@@ -285,7 +329,7 @@ void ManufactureInfoState::lessEngineerRelease(Action * action)
 */
 void ManufactureInfoState::moreUnitPress(Action * action)
 {
-	_timerMoreUnit->start();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerMoreUnit->start();
 }
 
 /**
@@ -294,7 +338,36 @@ void ManufactureInfoState::moreUnitPress(Action * action)
 */
 void ManufactureInfoState::moreUnitRelease(Action * action)
 {
-	_timerMoreUnit->stop();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerMoreUnit->stop();
+}
+
+/**
+ * This could set a virtual infinite value for units
+ * which could mean produce & sell automatically just like in UFOextender. :)
+ * Perhaps someone will implement that feature later.
+ * @param action a pointer to an Action
+*/
+void ManufactureInfoState::moreUnitClick(Action * action)
+{
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+	{
+    // TODO: virtual infinite value for produce & sell automatically
+    // now it just raises the value to 999 or max-available-hangars on crafts
+	  int more = _production->getAmountRemaining ();
+	  if (_production->getRules()->getCategory() == "STR_CRAFT")
+	  {
+		  if (_base->getAvailableHangars() - _base->getUsedHangars() > 0)
+      {
+		    _production->setAmountRemaining(std::max(more,_base->getAvailableHangars() - _base->getUsedHangars()));
+		    setAssignedEngineer();
+      }
+	  }
+	  else
+	  {
+		  _production->setAmountRemaining(std::max(more,999));
+		  setAssignedEngineer();
+	  }
+	}
 }
 
 /**
@@ -303,7 +376,7 @@ void ManufactureInfoState::moreUnitRelease(Action * action)
 */
 void ManufactureInfoState::lessUnitPress(Action * action)
 {
-	_timerLessUnit->start();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerLessUnit->start();
 }
 
 /**
@@ -312,7 +385,24 @@ void ManufactureInfoState::lessUnitPress(Action * action)
 */
 void ManufactureInfoState::lessUnitRelease(Action * action)
 {
-	_timerLessUnit->stop();
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)	_timerLessUnit->stop();
+}
+
+/**
+ * Build no more unit
+ * @param action a pointer to an Action
+*/
+void ManufactureInfoState::lessUnitClick(Action * action)
+{
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+	{
+	  int less = _production->getAmountRemaining ();
+	  if (less > (_production->getAmountProduced () + 1))
+	  {
+		  _production->setAmountRemaining(_production->getAmountProduced () + 1);
+		  setAssignedEngineer();
+	  }
+	}
 }
 
 /**

src/Basescape/ManufactureInfoState.h

@@ -54,18 +54,26 @@ class ManufactureInfoState : public State
 	void moreEngineerPress(Action * action);
 	/// Handler for releasing the more engineer button
 	void moreEngineerRelease(Action * action);
+	/// Handler for clicking the more engineer button
+	void moreEngineerClick(Action * action);
 	/// Handler for pressing the more unit button
 	void moreUnitPress(Action * action);
 	/// Handler for releasing the more unit button
 	void moreUnitRelease(Action * action);
+	/// Handler for clicking the more unit button
+	void moreUnitClick(Action * action);
 	/// Handler for pressing the less engineer button
 	void lessEngineerPress(Action * action);
 	/// Handler for releasing the less engineer button
 	void lessEngineerRelease(Action * action);
+	/// Handler for clicking the less engineer button
+	void lessEngineerClick(Action * action);
 	/// Handler for pressing the less unit button
 	void lessUnitPress(Action * action);
 	/// Handler for releasing the less unit button
 	void lessUnitRelease(Action * action);
+	/// Handler for clicking the less unit button
+	void lessUnitClick(Action * action);
 	/// Add one engineer to production (if possible)
 	void onMoreEngineer();
 	/// Remove one engineer to production (if possible)