Fixing minor bugs, some renaming

docs/NPC_BEHAVIOR.md

@@ -0,0 +1,85 @@
+# Hostile NPC Behavior
+
+## Authority and update order
+
+Hostile NPC behavior is simulated by `LocationGameState` and
+`CharacterState`. Rendering objects do not select targets and do not change
+NPC combat state.
+
+During each authoritative simulation tick:
+
+1. The location gathers the enabled players and NPCs visible to the
+   simulation.
+2. Each hostile NPC selects or retains a player target.
+3. Every character advances using the same tick-start observations.
+4. Movement reservations and attack damage are resolved deterministically.
+5. Navigation recovery events are applied by `InternalGameServer`.
+
+The resulting state and recovery decisions are replicated through the existing
+WebSocket lockstep stream. NPC target changes are simulation consequences, not
+client commands.
+
+## Eligible players and nearest selection
+
+An eligible target must:
+
+- exist in the campaign player map;
+- be enabled;
+- have positive health; and
+- be within the NPC's `visibleRange` when a new target is selected.
+
+Distance is measured in the X/Z plane. If two players are equally close,
+their stable player IDs are compared lexicographically. This gives every
+lockstep replica the same result regardless of hash-map iteration order.
+
+## Ordinary target locking
+
+Once a hostile NPC has a valid target, it keeps that target during ordinary
+ticks. The target remains locked even if it moves outside `visibleRange`.
+The lock ends when the player dies or becomes disabled.
+
+When a lock ends, the NPC selects the nearest eligible player in range. If no
+player qualifies, it clears the attack target, leaves combat state, and
+requests a route to its `homePosition`.
+
+## Movement blockage and target reconsideration
+
+NPC movement uses a retry schedule after a character blocks its path. The
+blocked NPC first stops and waits for its deterministic navigation retry
+cooldown. When the retry event emits `forceNavigationReplan`, the authoritative
+location state performs a fresh target selection across all eligible players.
+
+This blocked-replan selection differs from ordinary target locking:
+
+- the current target is not privileged;
+- the nearest eligible player may remain the target;
+- a nearer eligible player replaces the current target;
+- the route is rebuilt from the NPC's current position toward the selected
+  player's current position.
+
+If no eligible player is in range during blocked recovery, the NPC clears its
+stale chase target and returns toward its home position instead. The blocker is
+still passed to path planning so the immediate replan does not route through
+the character that caused the recovery event.
+
+## Death, disconnect, and attack safety
+
+Dead or disabled players are excluded from target acquisition. A target that
+dies or disconnects is therefore invalidated on the next authoritative
+selection pass, and the NPC either switches to another player or returns home.
+
+Attack impacts are also validated at application time. Damage is ignored if
+the recorded target no longer exists, is disabled, or has already reached
+zero health. This prevents a queued animation impact from damaging a stale
+target.
+
+## Regression expectations
+
+The state and pathfinding tests should preserve these guarantees:
+
+- nearest in-range player selection is deterministic;
+- a valid ordinary lock is retained;
+- blocked NPC recovery can replace the target and rebuild the chase route;
+- no-target blocked recovery clears combat and routes home;
+- dead and disabled players cannot be selected or damaged;
+- retry cooldowns and blocker identity remain deterministic.

resources/config/campaigns.json

@@ -2,7 +2,10 @@
     "campaigns": [
         {
             "id": "main",
-            "title": { "ru": "Основная игра", "en": "Main Game" },
+            "title": {
+                "ru": "Основная игра",
+                "en": "Main Game"
+            },
             "locations": [
                 "resources/config/locations/location_dorm.json",
                 "resources/config/locations/uni_exterior.json",
@@ -17,12 +20,15 @@
         },
         {
             "id": "battle_zone",
-            "title": { "ru": "Зона боя (одиночная)", "en": "Battle Zone (Single Player)" },
+            "title": {
+                "ru": "Зона боя (одиночная)",
+                "en": "Battle Zone (Single Player)"
+            },
             "locations": [
-                "resources/config/locations/battle_zone_uni_exterior.json"
+                "resources/config/locations/battle_zone_korea.json"
             ],
-            "startLocation": "uni_exterior",
+            "startLocation": "park_korea",
-            "startMusic": "music/bishkek univer day.ogg",
+            "startMusic": "music/bishkek fight calm.ogg",
             "startState": "resources/config/start_state_battle_zone_singleplayer.json",
             "quests": "resources/config/quests_battle_zone.json",
             "tutorial": false,
@@ -30,16 +36,24 @@
         },
         {
             "id": "battle_zone_multiplayer",
-            "title": { "ru": "Зона боя (сетевая)", "en": "Battle Zone (Multiplayer)" },
+            "title": {
+                "ru": "Зона боя (сетевая)",
+                "en": "Battle Zone (Multiplayer)"
+            },
             "locations": [
-                "resources/config/locations/battle_zone_uni_exterior.json"
+                "resources/config/locations/battle_zone_korea.json"
             ],
-            "startLocation": "uni_exterior",
+            "startLocation": "park_korea",
-            "startMusic": "music/bishkek univer day.ogg",
+            "startMusic": "music/bishkek fight calm.ogg",
             "startState": "resources/config/start_state_battle_zone.json",
             "quests": "resources/config/quests_battle_zone.json",
             "tutorial": false,
-            "networkPlayerSlots": ["player", "player2"],
+            "networkPlayerSlots": [
+                "player1",
+                "player2",
+                "player3",
+                "player4"
+            ],
             "networkCompatibility": "battle-zone-lockstep-v5",
             "loadingScreen": "resources/w/ui/screen_loading.json"
         }

resources/config/locations/battle_zone_korea.json

@@ -1,5 +1,5 @@
 {
-    "id": "uni_exterior",
+    "id": "park_korea",
     "gameObjects": "resources/w/shelter/game_objects.json",
 	"interactiveObjects": "resources/w/shelter/interactive_objects.json",
     "npcs": "resources/config/npcs_battle_zone.json",

resources/config/npcs_battle_zone.json

@@ -161,6 +161,168 @@
         "hp": 35,
 		"visibleRange" : 6.5,
         "canAttack": true
+      },
+	  {
+        "id": "ghost_07x",
+        "name": "Тень",
+		"meshTextures": {
+			"Shadow_NPC_Rigged":      "resources/w/shadow/Shadow_BaseColor.png"
+		  },
+        "animationIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationWalkPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionAttackPath": "resources/w/shadow/shadow_attack003.anim",
+        "animationStandToActionPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToStandPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToDeathPath": "resources/w/shadow/shadow_die003.anim",
+        "animationDeathIdlePath": "resources/w/shadow/shadow_dead003.anim",
+        "positionX": -5.6,
+        "positionY": 0.0,
+        "positionZ": -14.0,
+        "walkSpeed": 1.5,
+        "rotationSpeed": 8.0,
+        "modelScale": 1.0,
+        "modelCorrectionRotX": -90.0,
+        "modelCorrectionRotY": 180.0,
+        "modelCorrectionRotZ": 0.0,
+        "hp": 35,
+		"visibleRange" : 6.5,
+        "canAttack": true
+      },
+	  {
+        "id": "ghost_08x",
+        "name": "Тень",
+		"meshTextures": {
+			"Shadow_NPC_Rigged":      "resources/w/shadow/Shadow_BaseColor.png"
+		  },
+        "animationIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationWalkPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionAttackPath": "resources/w/shadow/shadow_attack003.anim",
+        "animationStandToActionPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToStandPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToDeathPath": "resources/w/shadow/shadow_die003.anim",
+        "animationDeathIdlePath": "resources/w/shadow/shadow_dead003.anim",
+        "positionX": -6.4,
+        "positionY": 0.0,
+        "positionZ": -14.0,
+        "walkSpeed": 1.5,
+        "rotationSpeed": 8.0,
+        "modelScale": 1.0,
+        "modelCorrectionRotX": -90.0,
+        "modelCorrectionRotY": 180.0,
+        "modelCorrectionRotZ": 0.0,
+        "hp": 35,
+		"visibleRange" : 6.5,
+        "canAttack": true
+      },
+	  {
+        "id": "ghost_09x",
+        "name": "Тень",
+		"meshTextures": {
+			"Shadow_NPC_Rigged":      "resources/w/shadow/Shadow_BaseColor.png"
+		  },
+        "animationIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationWalkPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionAttackPath": "resources/w/shadow/shadow_attack003.anim",
+        "animationStandToActionPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToStandPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToDeathPath": "resources/w/shadow/shadow_die003.anim",
+        "animationDeathIdlePath": "resources/w/shadow/shadow_dead003.anim",
+        "positionX": -5.6,
+        "positionY": 0.0,
+        "positionZ": -14.5,
+        "walkSpeed": 1.5,
+        "rotationSpeed": 8.0,
+        "modelScale": 1.0,
+        "modelCorrectionRotX": -90.0,
+        "modelCorrectionRotY": 180.0,
+        "modelCorrectionRotZ": 0.0,
+        "hp": 35,
+		"visibleRange" : 6.5,
+        "canAttack": true
+      },
+	  {
+        "id": "ghost_10x",
+        "name": "Тень",
+		"meshTextures": {
+			"Shadow_NPC_Rigged":      "resources/w/shadow/Shadow_BaseColor.png"
+		  },
+        "animationIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationWalkPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionAttackPath": "resources/w/shadow/shadow_attack003.anim",
+        "animationStandToActionPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToStandPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToDeathPath": "resources/w/shadow/shadow_die003.anim",
+        "animationDeathIdlePath": "resources/w/shadow/shadow_dead003.anim",
+        "positionX": -6.4,
+        "positionY": 0.0,
+        "positionZ": -14.5,
+        "walkSpeed": 1.5,
+        "rotationSpeed": 8.0,
+        "modelScale": 1.0,
+        "modelCorrectionRotX": -90.0,
+        "modelCorrectionRotY": 180.0,
+        "modelCorrectionRotZ": 0.0,
+        "hp": 35,
+		"visibleRange" : 6.5,
+        "canAttack": true
+      },
+	  {
+        "id": "ghost_11x",
+        "name": "Тень",
+		"meshTextures": {
+			"Shadow_NPC_Rigged":      "resources/w/shadow/Shadow_BaseColor.png"
+		  },
+        "animationIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationWalkPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionAttackPath": "resources/w/shadow/shadow_attack003.anim",
+        "animationStandToActionPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToStandPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToDeathPath": "resources/w/shadow/shadow_die003.anim",
+        "animationDeathIdlePath": "resources/w/shadow/shadow_dead003.anim",
+        "positionX": -5.6,
+        "positionY": 0.0,
+        "positionZ": -15.0,
+        "walkSpeed": 1.5,
+        "rotationSpeed": 8.0,
+        "modelScale": 1.0,
+        "modelCorrectionRotX": -90.0,
+        "modelCorrectionRotY": 180.0,
+        "modelCorrectionRotZ": 0.0,
+        "hp": 35,
+		"visibleRange" : 6.5,
+        "canAttack": true
+      },
+	  {
+        "id": "ghost_12x",
+        "name": "Тень",
+		"meshTextures": {
+			"Shadow_NPC_Rigged":      "resources/w/shadow/Shadow_BaseColor.png"
+		  },
+        "animationIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationWalkPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionIdlePath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionAttackPath": "resources/w/shadow/shadow_attack003.anim",
+        "animationStandToActionPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToStandPath": "resources/w/shadow/shadow_idle003.anim",
+        "animationActionToDeathPath": "resources/w/shadow/shadow_die003.anim",
+        "animationDeathIdlePath": "resources/w/shadow/shadow_dead003.anim",
+        "positionX": -6.4,
+        "positionY": 0.0,
+        "positionZ": -15.0,
+        "walkSpeed": 1.5,
+        "rotationSpeed": 8.0,
+        "modelScale": 1.0,
+        "modelCorrectionRotX": -90.0,
+        "modelCorrectionRotY": 180.0,
+        "modelCorrectionRotZ": 0.0,
+        "hp": 35,
+		"visibleRange" : 6.5,
+        "canAttack": true
       }
     ]
 }

server/tests/LocationGameStateTests.cpp

@@ -194,6 +194,59 @@ int main()
 		return fail("Hostile NPC did not return home after losing its target");
 	}
 
+	auto blocker = std::make_shared<FRG::CharacterState>();
+	blocker->enabled = true;
+	blocker->hp = 50.f;
+	blocker->position = {0.8f, 0.f, 0.f};
+	state.npcs["blocker"] = blocker;
+	hostileNpc.position = Eigen::Vector3f::Zero();
+	hostileNpc.homePosition = {5.f, 0.f, 0.f};
+	hostileNpc.attackTargetId = "player";
+	hostileNpc.requestedWalkTarget = playerOne->position;
+	hostileNpc.walkTarget = playerOne->position;
+	hostileNpc.pathWaypoints = {playerOne->position};
+	hostileNpc.currentWaypointIndex = 0;
+	hostileNpc.movementBlockedTicks = 0;
+	playerOne->enabled = true;
+	playerOne->hp = 75.f;
+	playerOne->position = {4.f, 0.f, 0.f};
+	playerTwo->enabled = true;
+	playerTwo->hp = 75.f;
+	playerTwo->position = {2.f, 0.f, 0.f};
+
+	bool blockedRetryRequested = false;
+	for (int tick = 0; tick < 10 && !blockedRetryRequested; ++tick) {
+		const FRG::LocationSimulationEvents events =
+			state.update(100, combatPlayers, false);
+		for (const auto& event : events.characters) {
+			if (event.characterId == "npc" &&
+				event.events.forceNavigationReplan) {
+				blockedRetryRequested = true;
+				if (!state.replanCharacter(
+						"npc", combatPlayers,
+						event.events.blockingCharacterId)) {
+					return fail("Blocked NPC replan was rejected");
+				}
+			}
+		}
+	}
+	if (!blockedRetryRequested ||
+		hostileNpc.attackTargetId != "player2" ||
+		(hostileNpc.requestedWalkTarget - playerTwo->position).norm() >
+			FRG::CharacterState::kWalkThreshold) {
+		return fail("Blocked NPC did not switch to the nearest player");
+	}
+
+	playerOne->enabled = false;
+	playerTwo->enabled = false;
+	if (!state.replanCharacter("npc", combatPlayers, "blocker") ||
+		!hostileNpc.attackTargetId.empty() ||
+		hostileNpc.battle_state != 0 ||
+		(hostileNpc.requestedWalkTarget - hostileNpc.homePosition).norm() >
+			FRG::CharacterState::kWalkThreshold) {
+		return fail("Blocked NPC did not return home without an eligible target");
+	}
+
 	FRG::CampaignConfig battleZone;
 	battleZone.id = "battle_zone";
 	battleZone.questsPath = "resources/config/quests_battle_zone.json";

src/LocationGameState.cpp

@@ -173,11 +173,84 @@ bool LocationGameState::replanCharacter(
 {
 	CharacterState* character = findCharacter(id, players);
 	if (!character || !location) return false;
+	if (!forcedObstacleId.empty() && !character->isPlayer &&
+		character->canAttack && character->hp > 0.f) {
+		const std::string selectedTarget =
+			selectNpcTarget(*character, players, false);
+		if (selectedTarget != character->attackTargetId) {
+			character->stopInPlace();
+			character->attackTargetId = selectedTarget;
+			character->battle_state = 0;
+			character->attack = 0;
+		}
+
+		if (!selectedTarget.empty()) {
+			const CharacterState* target = findCharacter(selectedTarget, players);
+			if (target) {
+				character->setTarget(
+					target->position, {}, *location, id,
+					collectPathObstacles(id, players, forcedObstacleId));
+				return true;
+			}
+		}
+
+		character->attackTargetId.clear();
+		character->battle_state = 0;
+		character->attack = 0;
+		const Eigen::Vector3f homeTarget(
+			character->homePosition.x(), 0.f, character->homePosition.z());
+		if ((homeTarget - character->position).norm() >
+			CharacterState::kWalkThreshold) {
+			character->setTarget(
+				homeTarget, {}, *location, id,
+				collectPathObstacles(id, players, forcedObstacleId));
+		}
+		return true;
+	}
 	character->forceReplan(
 		*location, id, collectPathObstacles(id, players, forcedObstacleId));
 	return true;
 }
 
+std::string LocationGameState::selectNpcTarget(
+	const CharacterState& npc,
+	const PlayerStateMap& players,
+	bool preserveValidLock) const
+{
+	if (preserveValidLock) {
+		const auto locked = players.find(npc.attackTargetId);
+		if (locked != players.end() && locked->second &&
+			locked->second->enabled && locked->second->hp > 0.f)
+			return npc.attackTargetId;
+	}
+
+	std::vector<std::string> playerIds;
+	playerIds.reserve(players.size());
+	for (const auto& [id, player] : players)
+		if (player && player->enabled && player->hp > 0.f)
+			playerIds.push_back(id);
+	std::sort(playerIds.begin(), playerIds.end());
+
+	const float visibleRangeSquared = npc.visibleRange * npc.visibleRange;
+	std::string selectedTarget;
+	float nearestDistanceSquared = visibleRangeSquared;
+	for (const std::string& playerId : playerIds) {
+		const Eigen::Vector3f delta =
+			players.at(playerId)->position - npc.position;
+		const float distanceSquared =
+			delta.x() * delta.x() + delta.z() * delta.z();
+		if (distanceSquared <= nearestDistanceSquared &&
+			(selectedTarget.empty() ||
+			 distanceSquared < nearestDistanceSquared ||
+			 (distanceSquared == nearestDistanceSquared &&
+			  playerId < selectedTarget))) {
+			selectedTarget = playerId;
+			nearestDistanceSquared = distanceSquared;
+		}
+	}
+	return selectedTarget;
+}
+
 void LocationGameState::startTaxi()
 {
 	location->taxiCar.waypoints = location->taxiCarWaypoints;
@@ -321,13 +394,6 @@ LocationSimulationEvents LocationGameState::update(
 		if (player) playerIds.push_back(id);
 	std::sort(playerIds.begin(), playerIds.end());
 
-	std::vector<std::string> eligiblePlayerIds;
-	for (const std::string& id : playerIds) {
-		const auto& player = players.at(id);
-		if (player->enabled && player->hp > 0.f)
-			eligiblePlayerIds.push_back(id);
-	}
-
 	std::vector<std::string> npcIds;
 	npcIds.reserve(npcs.size());
 	for (const auto& [id, npc] : npcs)
@@ -343,30 +409,8 @@ LocationSimulationEvents LocationGameState::update(
 			continue;
 
 		const std::string previousTarget = npc.attackTargetId;
-		const auto locked = players.find(previousTarget);
+		const std::string selectedTarget =
-		const bool lockValid =
+			selectNpcTarget(npc, players, true);
-			locked != players.end() && locked->second &&
-			locked->second->enabled && locked->second->hp > 0.f;
-		std::string selectedTarget = lockValid ? previousTarget : std::string();
-
-		if (!lockValid) {
-			float nearestDistanceSquared = npc.visibleRange * npc.visibleRange;
-			for (const std::string& playerId : eligiblePlayerIds) {
-				const Eigen::Vector3f delta =
-					players.at(playerId)->position - npc.position;
-				const float distanceSquared =
-					delta.x() * delta.x() + delta.z() * delta.z();
-				if (distanceSquared <= nearestDistanceSquared) {
-					if (selectedTarget.empty() ||
-						distanceSquared < nearestDistanceSquared ||
-						(distanceSquared == nearestDistanceSquared &&
-							playerId < selectedTarget)) {
-						selectedTarget = playerId;
-						nearestDistanceSquared = distanceSquared;
-					}
-				}
-			}
-		}
 
 		if (selectedTarget != previousTarget) {
 			npc.stopInPlace();
@@ -474,7 +518,7 @@ LocationSimulationEvents LocationGameState::update(
 			source.events.attackDirection});
 	}
 
-	auto player = players.find("player");
+	auto player = players.find("player1");
 	if (!interactiveObjectsLocked &&
 		!location->targetInteractiveObjectId.empty() &&
 		player != players.end() && player->second && player->second->enabled) {
@@ -502,7 +546,7 @@ LocationSimulationEvents LocationGameState::update(
 			(player->second->position - npc->position).norm();
 		if (distance <= NPC_TALK_DISTANCE) {
 			player->second->stopInPlace();
-			npc->faceTargetId = "player";
+			npc->faceTargetId = "player1";
 			result.npcInteractionId = location->targetInteractNpcId;
 			location->targetInteractNpcId.clear();
 		}

src/LocationGameState.h

@@ -86,6 +86,10 @@ struct LocationGameState {
 	void load(const nlohmann::json& in);
 
 private:
+	std::string selectNpcTarget(
+		const CharacterState& npc,
+		const PlayerStateMap& players,
+		bool preserveValidLock) const;
 	bool updateNpcCar(std::int64_t deltaMs);
 };
 

src/ScriptEngine.cpp

@@ -172,7 +172,7 @@ namespace FRG {
                         << npcId << "'\n";
                     return;
                 }
-                loc->faceCharacter(*npc, "player");
+                loc->faceCharacter(*npc, "player1");
             });
 
         api.set_function("player_walk_to",

src/game_server/InternalGameServer.h

@@ -51,7 +51,7 @@ private:
 	GameSnapshot buildSnapshot() const;
 
 	GameState state_;
-	std::string localPlayerId_ = "player";
+	std::string localPlayerId_ = "player1";
 	std::string resourceZipFile_;
 	std::vector<std::string> networkPlayerSlots_;
 	std::int64_t battleZoneTestBotElapsedMs_ = 0;