Merge pull request #82 from Pluviolithic/refactor/issue-64/improve-co…

…mbat

Finish idle handling for combat

src/client/State/Middleware.lua

@@ -32,6 +32,7 @@ local function updateIdleAnimationMiddleware(nextDispatch, store)
 				then
 					player.Character.Animate.idle.Animation1.AnimationId =
 						ReplicatedStorage.CombatAnimations[equippedWeapon].Idle.AnimationId
+					player.Character.Humanoid:ChangeState(Enum.HumanoidStateType.Landed)
 				else
 					player.Character.Animate.idle.Animation1.AnimationId =
 						ReplicatedStorage.CombatAnimations.Fists.Idle.AnimationId
@@ -46,6 +47,7 @@ local function updateIdleAnimationMiddleware(nextDispatch, store)
 					end
 				end
 				player.Character.Animate.idle.Animation1.AnimationId = originalAnimationId
+				player.Character.Humanoid:ChangeState(Enum.HumanoidStateType.Landed)
 			end
 		end
 		nextDispatch(action)

src/server/Combat/Enemies/ApplyDamageToEnemy.lua

@@ -45,5 +45,10 @@ return function(player, enemy, info, janitor)
 			info.HealthValue.Value -= damageToDeal
 			task.wait(animationUtilities.getPlayerAttackSpeed(player))
 		end
+		local rootPart = if enemy.Humanoid.RootPart then enemy.Humanoid.RootPart else enemy:FindFirstChild "RootPart"
+		local fightRange = enemy.Configuration.FightRange.Value
+		if player:DistanceFromCharacter(rootPart.Position) > fightRange + 10 then
+			janitor:Destroy()
+		end
 	end)
 end

src/server/Combat/Enemies/init.lua

@@ -148,7 +148,10 @@ local function handleEnemy(enemy)
 
 		playerJanitor:Add(
 			store.changed:connect(function(newState)
-				if selectors.getCurrentTarget(newState, player.Name) ~= enemy then
+				if
+					not selectors.isPlayerLoaded(newState, player.Name)
+					or selectors.getCurrentTarget(newState, player.Name) ~= enemy
+				then
 					playerJanitor:Destroy()
 				end
 			end),
@@ -175,7 +178,7 @@ local function handleEnemy(enemy)
 
 		repeat
 			task.wait(0.1)
-		until player:DistanceFromCharacter(rootPart.Position) <= fightRange + 5
+		until player:DistanceFromCharacter(rootPart.Position) <= fightRange + 1
 			or not Janitor.Is(playerJanitor)
 			or not selectors.isPlayerLoaded(store:getState(), player.Name)