+ added decay_rate for detectors when use_condition = true. on animation end this value will be subtracted from the items condition

= fixed issue with non-slot equipment mechanic and stacks
~ added PDA_SLOT and TORCH_SLOT to list

Author: revolucas

src/xrGame/CustomDetector.cpp

@@ -155,7 +155,11 @@ void CCustomDetector::OnAnimationEnd(u32 state)
     inherited::OnAnimationEnd(state);
     switch (state)
     {
-    case eShowing: { SwitchState(eIdle);
+    case eShowing:
+    {
+        SwitchState(eIdle);
+        if (IsUsingCondition() && m_fDecayRate > 0.f)
+            this->SetCondition(-m_fDecayRate);
     }
     break;
     case eHiding:
@@ -197,6 +201,7 @@ void CCustomDetector::Load(LPCSTR section)
 
     m_fAfDetectRadius = pSettings->r_float(section, "af_radius");
     m_fAfVisRadius = pSettings->r_float(section, "af_vis_radius");
+    m_fDecayRate = READ_IF_EXISTS(pSettings, r_float, section, "decay_rate", 0.f); //Alundaio
     m_artefacts.load(section, "af");
 
     m_sounds.LoadSound(section, "snd_draw", "sndShow");
@@ -214,6 +219,10 @@ void CCustomDetector::shedule_Update(u32 dt)
 
     Fvector P;
     P.set(H_Parent()->Position());
+
+    if (IsUsingCondition() && GetCondition() <= 0.01f)
+        return;
+
     m_artefacts.feel_touch_update(P, m_fAfDetectRadius);
 }
 

src/xrGame/CustomDetector.h

@@ -166,7 +166,7 @@ class CCustomDetector : public CHudItemObject
 
     bool m_bWorking;
     float m_fAfVisRadius;
-
+    float m_fDecayRate; //Alundaio
     CAfList m_artefacts;
 };
 

src/xrGame/console_commands.cpp

@@ -96,7 +96,7 @@ extern int g_upgrades_log;
 extern float g_smart_cover_animation_speed_factor;
 
 extern BOOL g_ai_use_old_vision;
-float g_aim_predict_time = 0.44f;
+float g_aim_predict_time = 0.40f;
 int g_keypress_on_start = 1;
 
 ENGINE_API extern float g_console_sensitive;
@@ -2161,10 +2161,11 @@ void CCC_RegisterCommands()
 #ifdef DEBUG
     extern BOOL g_ai_dbg_sight;
     CMD4(CCC_Integer, "ai_dbg_sight", &g_ai_dbg_sight, 0, 1);
+#endif // #ifdef DEBUG
 
+    //Alundaio: Scoped outside DEBUG
     extern BOOL g_ai_aim_use_smooth_aim;
     CMD4(CCC_Integer, "ai_aim_use_smooth_aim", &g_ai_aim_use_smooth_aim, 0, 1);
-#endif // #ifdef DEBUG
 
     extern float g_ai_aim_min_speed;
     CMD4(CCC_Float, "ai_aim_min_speed", &g_ai_aim_min_speed, 0.f, 10.f * PI);

src/xrGame/ui/UIActorMenuInventory.cpp

@@ -421,6 +421,8 @@ void CUIActorMenu::InitInventoryContents(CUIDragDropListEx* pBagList)
         InitCellForSlot(BINOCULAR_SLOT);
     if (!m_pActorInvOwner->inventory().SlotIsPersistent(ARTEFACT_SLOT))
         InitCellForSlot(ARTEFACT_SLOT);
+    if (!m_pActorInvOwner->inventory().SlotIsPersistent(PDA_SLOT))
+        InitCellForSlot(PDA_SLOT);
     if (!m_pActorInvOwner->inventory().SlotIsPersistent(TORCH_SLOT))
         InitCellForSlot(TORCH_SLOT); //Alundaio: TODO find out why this crash when you unequip
     //-Alundaio
@@ -586,8 +588,24 @@ bool CUIActorMenu::ToSlot(CUICellItem* itm, bool force_place, u16 slot_id)
         }
         else
         {
-            SendEvent_Item2Slot(iitem, m_pActorInvOwner->object_id(), slot_id);
-            SendEvent_ActivateSlot(slot_id, m_pActorInvOwner->object_id());
+            //Alundaio: Since the player's inventory is being used as a slot we need to search for cell with matching m_pData
+            CUICellContainer* c = slot_list->GetContainer();
+            WINDOW_LIST child_list = c->GetChildWndList();
+            // XXX: try to replace with range-based for
+            for (WINDOW_LIST::iterator it = child_list.begin(); child_list.end() != it; ++it)
+            {
+                CUICellItem* i = static_cast<CUICellItem*>(*it);
+                const PIItem pitm = static_cast<PIItem>(i->m_pData);
+                if (pitm == _iitem)
+                {
+                    if (ToBag(i, false))
+                        break;
+
+                    return false;
+                }
+            }
+
+            return ToSlot(itm, false, slot_id);
         }
 
         bool result = ToSlot(itm, false, slot_id);
@@ -721,6 +739,8 @@ CUIDragDropListEx* CUIActorMenu::GetSlotList(u16 slot_idx)
 
     case DETECTOR_SLOT: return m_pInventoryDetectorList; break;
 
+    case PDA_SLOT:
+    case TORCH_SLOT:
     case ARTEFACT_SLOT:
     case BINOCULAR_SLOT:
     case KNIFE_SLOT:

src/xrGame/ui/UIActorMenu_action.cpp

@@ -192,14 +192,15 @@ bool CUIActorMenu::OnItemDbClick(CUICellItem* itm)
         {
             break;
         }
-        PIItem iitem_to_place = (PIItem)itm->m_pData;
-        if (!ToSlot(itm, false, iitem_to_place->BaseSlot()))
+        PIItem iitem_to_place = static_cast<PIItem>(itm->m_pData);
+        if (!m_pActorInvOwner->inventory().SlotIsPersistent(iitem_to_place->BaseSlot())
+            && m_pActorInvOwner->inventory().ItemFromSlot(iitem_to_place->BaseSlot()) == iitem_to_place)
         {
+            ToBag(itm, false);
+        }
+        else if (!ToSlot(itm, false, iitem_to_place->BaseSlot()))
             if (!ToBelt(itm, false))
-            {
                 ToSlot(itm, true, iitem_to_place->BaseSlot());
-            }
-        }
         break;
     }
     case iActorBelt:

src/xrGame/ui/UIDragDropListEx.cpp

@@ -481,19 +481,20 @@ bool CUICellContainer::AddSimilar(CUICellItem* itm)
     if (!m_pParentDragDropList->IsGrouping())
         return false;
 
+    //Alundaio: Don't stack equipped items
+    const PIItem iitem = static_cast<PIItem>(itm->m_pData);
+    if (iitem && iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(iitem->BaseSlot()) == iitem)
+        return false;
+    //-Alundaio
+
     CUICellItem* i = FindSimilar(itm);
-    if (i == nullptr)
+    if (i == nullptr || i == itm || itm->ChildsCount() > 0)
         return false;
 
-    R_ASSERT(i != itm);
-    R_ASSERT(0 == itm->ChildsCount());
-    if (i)
-    {
-        i->PushChild(itm);
-        itm->SetOwnerList(m_pParentDragDropList);
-    }
+    i->PushChild(itm);
+    itm->SetOwnerList(m_pParentDragDropList);
 
-    return (i != NULL);
+    return true;
 }
 
 CUICellItem* CUICellContainer::FindSimilar(CUICellItem* itm)
@@ -510,11 +511,11 @@ CUICellItem* CUICellContainer::FindSimilar(CUICellItem* itm)
         PIItem iitem = static_cast<PIItem>(i->m_pData);
         if (iitem && iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(iitem->BaseSlot()) == iitem)
             continue;
+        //-Alundaio
 
         if (i == itm)
             continue;
 
-        //R_ASSERT(i != itm);
         if (i->EqualTo(itm))
             return i;
     }
@@ -869,12 +870,8 @@ void CUICellContainer::Draw()
                 {
                     //Alundaio: Highlight equipped items
                     PIItem iitem = static_cast<PIItem>(ui_cell.m_item->m_pData);
-                    if (iitem)
-                    {
-                        u16 slot = iitem->BaseSlot();
-                        if (iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(slot) == iitem)
-                            select_mode = 3;
-                    }
+                    if (iitem && iitem->m_pInventory && iitem->m_pInventory->ItemFromSlot(iitem->BaseSlot()) == iitem)
+                        select_mode = 3;
                     //-Alundaio
                 }
             }

src/xrGame/ui/UIDragDropListEx.h

@@ -150,6 +150,7 @@ class CUIDragDropListEx : public CUIWindow, public CUIWndCallback
     void clear_select_armament();
     Ivector2 PickCell(const Fvector2& abs_pos);
     CUICell& GetCellAt(const Ivector2& pos);
+    CUICellContainer* GetContainer() { return m_container; }; //Alundaio
 
 public:
     // UIWindow overriding