+ Added sanity checks to a couple actions that should verify if enemy/danger object actually exists before executing since it's possible these can become NULL between the time the evaluator is ran and the action is executed

+ Added a condition check to see if member is visible_now before transfering enemy through CAI_Stalker::process_enemies to prevent omniscient detection
* Changed ERROR to WARNING when an object is transfered to a new inventory owner when it doesn't have a parent

Author: revolucas

src/xrGame/ai/stalker/ai_stalker_misc.cpp

@@ -203,6 +203,11 @@ void CAI_Stalker::process_enemies()
             continue;
         }
 
+        //Alundaio: Only transfer enemy if I can see member at this very moment!
+        if (!memory().visual().visible_now(member))
+            continue;
+        //Alundaio: END
+
         memory().make_object_visible_somewhen(member->memory().enemy().selected());
         found = true;
         break;

src/xrGame/alife_online_offline_group.cpp

@@ -366,6 +366,25 @@ void CSE_ALifeOnlineOfflineGroup::force_change_position(Fvector position)
     // m_tGraphID				= new_graph_vertex;
 }
 
+//Alundaio: force new graph location
+/*
+void CSE_ALifeOnlineOfflineGroup::force_change_game_vertex_id(u32 game_vertex_id)
+{
+	if (game_vertex_id && ai().game_graph().valid_vertex_id(game_vertex_id))
+	{
+		const CGameGraph::CVertex vertex = *ai().game_graph().vertex(game_vertex_id);
+		m_tNodeID = vertex.level_vertex_id;
+		o_Position = vertex.level_point;
+
+		if (m_tGraphID != game_vertex_id)
+		{
+			alife().graph().change(this, m_tGraphID, game_vertex_id);
+		}
+	}
+}
+*/
+//Alundaio: END
+
 void CSE_ALifeOnlineOfflineGroup::on_failed_switch_online()
 {
     MEMBERS::const_iterator I = m_members.begin();

src/xrGame/stalker_combat_actions.cpp

@@ -784,8 +784,10 @@ void CStalkerActionDetourEnemy::initialize()
     object().agent_manager().member().member(m_object).cover(0);
 
     //#ifndef SILENT_COMBAT
-    if (object().memory().enemy().selected()->human_being() && object().agent_manager().member().group_behaviour())
-        //		object().sound().play			(eStalkerSoundNeedBackup);
+    //Alundaio: Sanity
+    if (object().memory().enemy().selected() && object().memory().enemy().selected()->human_being() && object().agent_manager().member().group_behaviour())
+    //Alundaio: END
+        //object().sound().play(eStalkerSoundNeedBackup);
         object().sound().play(eStalkerSoundDetour);
     //#endif
 }
@@ -806,6 +808,11 @@ void CStalkerActionDetourEnemy::execute()
 
     inherited::execute();
 
+    //Alundaio: Sanity
+    if (!object().memory().enemy().selected())
+        return;
+    //Alundaio: END
+
     CMemoryInfo mem_object = object().memory().memory(object().memory().enemy().selected());
 
     if (!mem_object.m_object)
@@ -1009,8 +1016,10 @@ void CStalkerActionSuddenAttack::execute()
 
     inherited::execute();
 
-    if (object().agent_manager().member().combat_members().size() > 1)
-        m_storage->set_property(eWorldPropertyUseSuddenness, false);
+    //Alundaio: Removed check to allow stalkers to sneak up on enemy even if they are in a squad; most likely removed because of friendly fire but not an issue with rx_ff scheme
+    //if (object().agent_manager().member().combat_members().size() > 1)
+    //    m_storage->set_property(eWorldPropertyUseSuddenness, false);
+    //Alundaio: END
 
     if (!object().memory().enemy().selected())
         return;
@@ -1133,6 +1142,11 @@ void CStalkerActionKillEnemyIfPlayerOnThePath::execute()
 
     inherited::execute();
 
+    //Alundaio: Sanity
+    if (!object().memory().enemy().selected())
+        return;
+    //Alundaio: END
+
     object().sight().setup(CSightAction(object().memory().enemy().selected(), true, true));
 
     fire();

src/xrGame/stalker_danger_in_direction_actions.cpp

@@ -145,6 +145,11 @@ void CStalkerActionDangerInDirectionLookOut::execute()
 {
     inherited::execute();
 
+    //Alundaio: This action should verify the danger object exists; sanity
+    if (!object().memory().danger().selected())
+        return;
+    //Alundaio: END
+
     //	CMemoryInfo							mem_object =
     // object().memory().memory(object().memory().danger().selected()->object());
     //

src/xrGame/xrServer_process_event_reject.cpp

@@ -42,7 +42,7 @@ bool xrServer::Process_event_reject(
     xr_vector<u16>::iterator c = std::find(C.begin(), C.end(), id_entity);
     if (c == C.end())
     {
-        Msg("! ERROR: SV: can't find children [%d] of parent [%d]", id_entity, e_parent);
+        Msg("! WARNING: SV: can't find children [%d] of parent [%d]", id_entity, e_parent);
         return false;
     }
 

src/xrServerEntities/xrServer_Objects_ALife_Monsters.h

@@ -720,6 +720,7 @@ class CSE_ALifeOnlineOfflineGroup : public CSE_ALifeDynamicObject,
     void clear_location_types();
     void add_location_type(LPCSTR mask);
     void force_change_position(Fvector position);
+    //void force_change_game_vertex_id(u32 game_vertex_id);
     virtual void on_failed_switch_online();
 #else
 public:

src/xrServerEntities/xrserver_objects_alife_monsters_script3.cpp

@@ -63,6 +63,7 @@ static void CSE_ALifeOnlineOfflineGroup_Export(lua_State* luaState)
             .def("add_location_type", &CSE_ALifeOnlineOfflineGroup::add_location_type)
             .def("clear_location_types", &CSE_ALifeOnlineOfflineGroup::clear_location_types)
             .def("force_change_position", &CSE_ALifeOnlineOfflineGroup::force_change_position)
+            //.def("force_change_game_vertex_id", &CSE_ALifeOnlineOfflineGroup::force_change_game_vertex_id)
 #endif
     ];
 }