Skip to content

Right-click inventory item opens UFOpaedia entry #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ayrtondenner wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Right-click inventory item opens UFOpaedia entry #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 63 additions & 1 deletion game/ui/base/vequipscreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
#include "game/state/city/vehicle.h"
#include "game/state/city/vequipment.h"
#include "game/state/gamestate.h"
#include "game/state/rules/city/ufopaedia.h"
#include "game/state/rules/city/vehicletype.h"
#include "game/ui/components/equipscreen.h"
#include "game/ui/general/messagebox.h"
#include "game/ui/general/vehiclesheet.h"
#include "game/ui/ufopaedia/ufopaediacategoryview.h"
#include "library/strings_format.h"

namespace OpenApoc
Expand Down Expand Up @@ -281,8 +283,68 @@ void VEquipScreen::eventOccurred(Event *e)
// Find the base this vehicle is landed in
StateRef<Base> base = selected->currentBuilding ? selected->currentBuilding->base : nullptr;

// Right-click: open UFOpaedia entry for the item under cursor
if (e->type() == EVENT_MOUSE_DOWN &&
Event::isPressed(e->mouse().Button, Event::MouseButton::Right) && !this->draggedEquipment)
{
Vec2<int> mousePos{e->mouse().X, e->mouse().Y};
StateRef<VEquipmentType> clickedType;

// Check if we're over any equipment in the paper doll
auto mouseSlotPos = this->paperDoll->getSlotPositionFromScreenPosition(mousePos);
auto equipment =
std::dynamic_pointer_cast<VEquipment>(this->selected->getEquipmentAt(mouseSlotPos));
if (equipment)
{
clickedType = equipment->type;
}
else
{
// Check if we're over any equipment in the inventory bar
for (auto &pair : this->inventoryItems)
{
if (pair.first.within(mousePos))
{
clickedType = pair.second;
break;
}
}
}

if (clickedType)
{
sp<UfopaediaCategory> ufopaediaCategory;
sp<UfopaediaEntry> ufopaediaEntry;
for (auto &cat : state->ufopaedia)
{
for (auto &entry : cat.second->entries)
{
if (entry.second->data_type == UfopaediaEntry::Data::VehicleEquipment &&
entry.second->data_id == clickedType.id)
{
ufopaediaEntry = entry.second;
ufopaediaCategory = cat.second;
break;
}
}
if (ufopaediaCategory)
{
break;
}
}
if (ufopaediaEntry && ufopaediaEntry->dependency.satisfied())
{
fw().stageQueueCommand(
{StageCmd::Command::PUSH,
mksp<UfopaediaCategoryView>(state, ufopaediaCategory, ufopaediaEntry)});
}
}
return;
}

// Only allow removing equipment if we're in a base, otherwise it'll disappear
if (e->type() == EVENT_MOUSE_DOWN && base)
if (e->type() == EVENT_MOUSE_DOWN &&
Event::isPressed(e->mouse().Button, Event::MouseButton::Left) && base)
{
Vec2<int> mousePos{e->mouse().X, e->mouse().Y};

Expand Down
80 changes: 76 additions & 4 deletions game/ui/general/aequipscreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "game/state/city/city.h"
#include "game/state/city/vehicle.h"
#include "game/state/gamestate.h"
#include "game/state/rules/city/ufopaedia.h"
#include "game/state/shared/aequipment.h"
#include "game/state/shared/agent.h"
#include "game/state/tilemap/tileobject_battleunit.h"
Expand All @@ -30,6 +31,7 @@
#include "game/ui/general/aequipmentsheet.h"
#include "game/ui/general/agentsheet.h"
#include "game/ui/general/messagebox.h"
#include "game/ui/ufopaedia/ufopaediacategoryview.h"
#include <boost/algorithm/string/join.hpp>

namespace OpenApoc
Expand Down Expand Up @@ -443,17 +445,87 @@ void AEquipScreen::eventOccurred(Event *e)
// Item manipulation
if (currentAgent->type->inventory && getMode() != Mode::Enemy)
{
// Picking up items
if (e->type() == EVENT_MOUSE_DOWN && !this->draggedEquipment)
// Picking up items (left-click)
if (e->type() == EVENT_MOUSE_DOWN && !this->draggedEquipment &&
Event::isPressed(e->mouse().Button, Event::MouseButton::Left))
{
handleItemPickup({e->mouse().X, e->mouse().Y});
}

// Placing items
if (e->type() == EVENT_MOUSE_UP && draggedEquipment)
// Placing items (left-click)
if (e->type() == EVENT_MOUSE_UP && draggedEquipment &&
Event::isPressed(e->mouse().Button, Event::MouseButton::Left))
{
handleItemPlacement({e->mouse().X, e->mouse().Y});
}

// Right-click: open UFOpaedia entry for the item under cursor
if (e->type() == EVENT_MOUSE_DOWN && !this->draggedEquipment &&
Event::isPressed(e->mouse().Button, Event::MouseButton::Right))
{
Vec2<int> mousePos{e->mouse().X, e->mouse().Y};
sp<AEquipment> clickedItem;

// Check if we're over any equipment in the paper doll
auto mouseSlotPos = this->paperDoll->getSlotPositionFromScreenPosition(mousePos);
auto equipment =
std::dynamic_pointer_cast<AEquipment>(currentAgent->getEquipmentAt(mouseSlotPos));
if (equipment)
{
clickedItem = equipment;
}
else
{
// Check if we're over any equipment in the inventory bar
auto posWithinInventory = mousePos;
posWithinInventory.x += inventoryPage * inventoryControl->Size.x;
for (auto &tuple : this->inventoryItems)
{
if (std::get<0>(tuple).within(posWithinInventory))
{
auto pos = std::get<0>(tuple).p0;
pos.x -= inventoryPage * inventoryControl->Size.x;
if (pos.x >= inventoryControl->Location.x + formMain->Location.x &&
pos.x < inventoryControl->Location.x + inventoryControl->Size.x +
formMain->Location.x)
{
clickedItem = std::get<2>(tuple);
}
break;
}
}
}

if (clickedItem)
{
const auto &itemTypeId = clickedItem->type.id;
sp<UfopaediaCategory> ufopaediaCategory;
sp<UfopaediaEntry> ufopaediaEntry;
for (auto &cat : state->ufopaedia)
{
for (auto &entry : cat.second->entries)
{
if (entry.second->data_type == UfopaediaEntry::Data::Equipment &&
entry.second->data_id == itemTypeId)
{
ufopaediaEntry = entry.second;
ufopaediaCategory = cat.second;
break;
}
}
if (ufopaediaCategory)
{
break;
}
}
if (ufopaediaEntry && ufopaediaEntry->dependency.satisfied())
{
fw().stageQueueCommand(
{StageCmd::Command::PUSH,
mksp<UfopaediaCategoryView>(state, ufopaediaCategory, ufopaediaEntry)});
}
}
}
}
}

Expand Down