diff --git a/Content/Character/Allium/Alium_Q_1.uasset b/Content/Character/Allium/Alium_Q_1.uasset new file mode 100644 index 0000000..b02203c --- /dev/null +++ b/Content/Character/Allium/Alium_Q_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39ed79a695a4516283f0ce403537413e1c4fec96e87508fb05c9bea4585dd6a1 +size 32213 diff --git a/Content/Character/Allium/Alium_Skill2.uasset b/Content/Character/Allium/Alium_Skill2.uasset new file mode 100644 index 0000000..4f6810b --- /dev/null +++ b/Content/Character/Allium/Alium_Skill2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3c17440b2244b46845119be6679fd4289c1f295952ce3fc96ad1e1efca3a608 +size 23133 diff --git a/Content/Character/Allium/Alium_W.uasset b/Content/Character/Allium/Alium_W.uasset new file mode 100644 index 0000000..e72658d --- /dev/null +++ b/Content/Character/Allium/Alium_W.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afe807bd7b0aa0fe1ef0659da3cd6f5d27cdaa3154d643e0c74f93b3e0804b75 +size 2709707 diff --git a/Content/Character/Allium/Animation/ABP_Allium.uasset b/Content/Character/Allium/Animation/ABP_Allium.uasset index 473064b..6f7c71b 100644 --- a/Content/Character/Allium/Animation/ABP_Allium.uasset +++ b/Content/Character/Allium/Animation/ABP_Allium.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:563c4fd86466b9763b2c4e748e1abbd2c77f6319120a7d21bbddd415da1d717f -size 92656 +oid sha256:362fd3d6fcfbd0cfb0cc30e6870a2b0280e3fafa508578914a649cfdf9f2f9c2 +size 280416 diff --git a/Content/Character/Allium/Animation/AttackCombo.uasset b/Content/Character/Allium/Animation/AttackCombo.uasset index 7940ec9..6b001d0 100644 --- a/Content/Character/Allium/Animation/AttackCombo.uasset +++ b/Content/Character/Allium/Animation/AttackCombo.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05f871db620ab63ea1883b0d1dc51bd7bac6aa016cac2982586f2a0a0e34a6e2 -size 10394 +oid sha256:daee87f1d02ae6f6d77481f10a59ee7f61ebb719c019f4c4acb8bf5760c85ced +size 10343 diff --git a/Content/Character/Allium/Animation/Skill1_Anim.uasset b/Content/Character/Allium/Animation/Skill1_Anim.uasset index bdeeca9..c5f3364 100644 --- a/Content/Character/Allium/Animation/Skill1_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill1_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62a4b589eba7c075febd5abd5da6b2bd4747b50398a8aad5b1cba0b9f0be1708 -size 148146 +oid sha256:fd556610da0df0a6a16fc09f65567c84ea62db0cfa4197a7902cd1472391384f +size 152237 diff --git a/Content/Character/Allium/Animation/Skill2_Anim.uasset b/Content/Character/Allium/Animation/Skill2_Anim.uasset index d1b8d4c..8163963 100644 --- a/Content/Character/Allium/Animation/Skill2_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63652406246641ac09c0cd9030af0a8cc8a79f12e5853e62711e1679d2b3e0f4 -size 128564 +oid sha256:6539635adc8b24217af1bbc63737c941c084faf30a1ae8c3b25a9082f4a9de0c +size 132678 diff --git a/Content/Character/Allium/Animation/Skill3_Anim.uasset b/Content/Character/Allium/Animation/Skill3_Anim.uasset index 9d48cf4..3a7b785 100644 --- a/Content/Character/Allium/Animation/Skill3_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill3_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e4a1b8d3acfa433867675f0802ab72e07bfd3560be2115e6fd950d76e65d9a8 -size 148021 +oid sha256:edfd48e96369cd5c11d4c4bb7cd183881e87126d5ce048e1c7e4fcf75a940337 +size 152144 diff --git a/Content/Character/Allium/Animation/Skill4_2_Anim.uasset b/Content/Character/Allium/Animation/Skill4_2_Anim.uasset index be6d8ad..db038ce 100644 --- a/Content/Character/Allium/Animation/Skill4_2_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill4_2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bebee620b94c23ce6d3c4b4e0a0d79b19c5c04b5528f015aea07d704b5fc07b0 -size 178321 +oid sha256:14924dede128da8b50bd7c9793a288d4ad8acbfa014850a9f0e78c5cd5e19985 +size 182598 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index d65b310..8af03e5 100644 --- a/Content/Character/Allium/BP_Allium.uasset +++ b/Content/Character/Allium/BP_Allium.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9badfd45987b6bd3b5a305561a5a4f936de41ded9979460ed7c96d84e980ceed -size 42428 +oid sha256:fcb784f0cb24a64149aec72d17cb4247ead004a0b33e9a3b4e35b5df4979ad06 +size 136354 diff --git a/Content/Character/BP_Folder/DefaultClass.uasset b/Content/Character/BP_Folder/DefaultClass.uasset new file mode 100644 index 0000000..290e04d --- /dev/null +++ b/Content/Character/BP_Folder/DefaultClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5ed77da0ce480dc769b0b85a288efb92533d78c89c87e099f1113df2782f898 +size 18108 diff --git a/Content/Character/Lb/Animation/ABP_Lb.uasset b/Content/Character/Lb/Animation/ABP_Lb.uasset index 7608da2..9830bab 100644 --- a/Content/Character/Lb/Animation/ABP_Lb.uasset +++ b/Content/Character/Lb/Animation/ABP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af6cb9237f08342613ad4d82d44cd4691193b8a19a22d6c731ffca4fe3f71a5a -size 288811 +oid sha256:19a595e309286b475f42c5ba91074a9af7f66a42a630a815443662e6389d552f +size 274795 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 592916e..ed5ae7a 100644 --- a/Content/Character/Lb/BP_Lb.uasset +++ b/Content/Character/Lb/BP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4333582ec21603e00a3b2e40c45435c9021d66acb90c0aa972003751ae2bc254 -size 105236 +oid sha256:5823f96c3536dcb4e632cd19dfc682a50b9b02d64e73e61f1fecbc0b09e4b4da +size 147586 diff --git a/Content/Character/Lb/LB_Bolla_Throw.uasset b/Content/Character/Lb/LB_Bolla_Throw.uasset new file mode 100644 index 0000000..8328842 --- /dev/null +++ b/Content/Character/Lb/LB_Bolla_Throw.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb47290031b302262dc6571fe6ff9eaf99f70ad2af232f572e3f711235e94727 +size 31160 diff --git a/Content/Character/Monster/Golem/Animation/Golem_Attack1_L_얼굴_RetopoFlow_Anim.uasset b/Content/Character/Monster/Golem/Animation/Golem_Attack1_L_얼굴_RetopoFlow_Anim.uasset deleted file mode 100644 index 5613625..0000000 --- a/Content/Character/Monster/Golem/Animation/Golem_Attack1_L_얼굴_RetopoFlow_Anim.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9651f044441d1204471c66dd322e698334352ba990125c97e86d8b343043d8e9 -size 123750 diff --git a/Content/Character/Monster/Golem/Animation/Golem_Attack1_R_얼굴_RetopoFlow_Anim.uasset b/Content/Character/Monster/Golem/Animation/Golem_Attack1_R_얼굴_RetopoFlow_Anim.uasset deleted file mode 100644 index 21dc50c..0000000 --- a/Content/Character/Monster/Golem/Animation/Golem_Attack1_R_얼굴_RetopoFlow_Anim.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69106f2527c84eccdd10b9285ac64c7ed4dc97d8e8aff6a32bb46b2fa95d2a5b -size 122964 diff --git a/Content/Character/Monster/Golem/Animation/Golem_Attack2_얼굴_RetopoFlow_Anim.uasset b/Content/Character/Monster/Golem/Animation/Golem_Attack2_얼굴_RetopoFlow_Anim.uasset deleted file mode 100644 index 75a293f..0000000 --- a/Content/Character/Monster/Golem/Animation/Golem_Attack2_얼굴_RetopoFlow_Anim.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a54853a998fbe7b11b8bd0672f15357aefa5babbc0ddc1894edc52182e00bd99 -size 122638 diff --git a/Content/Character/Monster/Golem/Animation/Golem_Idel_Anim.uasset b/Content/Character/Monster/Golem/Animation/Golem_Idel_Anim.uasset deleted file mode 100644 index 97ba984..0000000 --- a/Content/Character/Monster/Golem/Animation/Golem_Idel_Anim.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3b2ecd047001ad4ae1be1377264d29f9a4d668cae4209c227483169db70cbe3 -size 167839 diff --git a/Content/Character/Monster/Golem/Animation/Golem_Regen1_Anim.uasset b/Content/Character/Monster/Golem/Animation/Golem_Regen1_Anim.uasset deleted file mode 100644 index f556721..0000000 --- a/Content/Character/Monster/Golem/Animation/Golem_Regen1_Anim.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4fd4526af5dff5ba03c6267c9ee8d65a1eff4bef8d45113fc010c4e537839af1 -size 360617 diff --git a/Content/Character/Monster/Golem/Animation/Golem_Strong_Attack2_얼굴_RetopoFlow_Anim.uasset b/Content/Character/Monster/Golem/Animation/Golem_Strong_Attack2_얼굴_RetopoFlow_Anim.uasset deleted file mode 100644 index 0af4021..0000000 --- a/Content/Character/Monster/Golem/Animation/Golem_Strong_Attack2_얼굴_RetopoFlow_Anim.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4abbd5e396029254b2557a85e160a4631666396d85453a2223f27a1911ca7089 -size 163164 diff --git a/Content/Character/Monster/Golem/Animation/Golem_Strong_Attack3_얼굴_RetopoFlow_Anim.uasset b/Content/Character/Monster/Golem/Animation/Golem_Strong_Attack3_얼굴_RetopoFlow_Anim.uasset deleted file mode 100644 index bcb3366..0000000 --- a/Content/Character/Monster/Golem/Animation/Golem_Strong_Attack3_얼굴_RetopoFlow_Anim.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5de4e81488a663c9c85760d6de0b69c76fffa95de0727e4d80aca960b8b4ebb2 -size 115790 diff --git a/Content/Character/Monster/Golem/Animation/Golem_Walking_얼굴_RetopoFlow_Anim.uasset b/Content/Character/Monster/Golem/Animation/Golem_Walking_얼굴_RetopoFlow_Anim.uasset deleted file mode 100644 index 6509c39..0000000 --- a/Content/Character/Monster/Golem/Animation/Golem_Walking_얼굴_RetopoFlow_Anim.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6685b9f4b085686907dbaed1f306d94a40e36c274017583f5c750ea82003f7ba -size 137814 diff --git a/Content/Character/Monster/Golem/Material/Material__0.uasset b/Content/Character/Monster/Golem/Material/Material__0.uasset deleted file mode 100644 index 4e1f464..0000000 --- a/Content/Character/Monster/Golem/Material/Material__0.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e71973e2d510656afe6bd8faacbcc197ae018db3f8817d86fc7b97bc9e02ff9f -size 11447 diff --git a/Content/Character/Monster/Golem/PhysicsAsset/Golem_Idel_PhysicsAsset.uasset b/Content/Character/Monster/Golem/PhysicsAsset/Golem_Idel_PhysicsAsset.uasset deleted file mode 100644 index 397bf19..0000000 --- a/Content/Character/Monster/Golem/PhysicsAsset/Golem_Idel_PhysicsAsset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c48c0bbec236d853141f598aef0d26053cdf7cd51ae68f91b64a7ce5760f80be -size 51524 diff --git a/Content/Character/Monster/Golem/SkeletalMesh/Golem_Idel.uasset b/Content/Character/Monster/Golem/SkeletalMesh/Golem_Idel.uasset deleted file mode 100644 index 0567b1f..0000000 --- a/Content/Character/Monster/Golem/SkeletalMesh/Golem_Idel.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9396cd2fd7eeceb3a65ffeaf3fa068e1d7dec54787cce19aa9303e05111d5a20 -size 4035154 diff --git a/Content/Character/Monster/Golem/Skeleton/Golem_Idel_Skeleton.uasset b/Content/Character/Monster/Golem/Skeleton/Golem_Idel_Skeleton.uasset deleted file mode 100644 index e5d7946..0000000 --- a/Content/Character/Monster/Golem/Skeleton/Golem_Idel_Skeleton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3eed25e8cda0be584aff5b1645d864e346849d3d2bf20f934a4a2444bdacd7d9 -size 17314 diff --git a/Content/Character/Monster/Golem/Texture/골렘_로우폴리곤_조립_01_-_Default_BaseColor.uasset b/Content/Character/Monster/Golem/Texture/골렘_로우폴리곤_조립_01_-_Default_BaseColor.uasset deleted file mode 100644 index 9bdeb31..0000000 --- a/Content/Character/Monster/Golem/Texture/골렘_로우폴리곤_조립_01_-_Default_BaseColor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80da6cc373b7208a402d9739d568329029a65fac995dda4fad803e060fa82c78 -size 21675485 diff --git a/Content/Character/Notify/Rotating.uasset b/Content/Character/Notify/Rotating.uasset index 4b501ea..1721fbc 100644 --- a/Content/Character/Notify/Rotating.uasset +++ b/Content/Character/Notify/Rotating.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91d70510270971c37f2ca062eaaed6a22a7b8ca059724a32ebafcea74d9ecb5e -size 57531 +oid sha256:722e1ba1cb36019a359f0a97fb2e4dd68f1bf9d66e18a5cbf36590126b04b1bf +size 22176 diff --git a/Content/Effect/LB/Bolla_Throw.uasset b/Content/Effect/LB/Bolla_Throw.uasset index f6e65f4..e966422 100644 --- a/Content/Effect/LB/Bolla_Throw.uasset +++ b/Content/Effect/LB/Bolla_Throw.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3032829c1357c6752372b76c11ac8833201290f2bcb5723ce3db19b02c1b8f5e -size 2435 +oid sha256:e67491966cf5cb89fa6f8cc50d80af11e60a1528f62521909418794ac10f3bb6 +size 2450 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 25747db..e784d70 100644 --- a/Content/Maps/DevMap.umap +++ b/Content/Maps/DevMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09c5c53a199a7602b7c34db2f1a33dd24dfb54c381cda29ed3b10b8175950004 -size 181094 +oid sha256:eafa44264c78ea410d8674da1e306f54207ca688ab40e1fcd840743ef1c11024 +size 182139 diff --git a/Content/StarterContent/Materials/M_Basic_Floor.uasset b/Content/StarterContent/Materials/M_Basic_Floor.uasset index 07401c9..692bdbd 100644 --- a/Content/StarterContent/Materials/M_Basic_Floor.uasset +++ b/Content/StarterContent/Materials/M_Basic_Floor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38e9963796183aa39c6cd4219fe60403740c902dadd223b96e37158f5b8e07f8 -size 9515 +oid sha256:d51f08077872e27018658f13799b9e9269d787cf9bbd178cbe06e916cd463ee2 +size 9598 diff --git a/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset b/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset index 96f3272..bdc2b9e 100644 --- a/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset +++ b/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:969f0add70f571adb7e14da5ca542a15955166103efd54168a5e248826564781 -size 10357 +oid sha256:5e9c60f50d6823e244eaa976a388e784ef73bf137c510e3cc338ef0101b17dda +size 10455 diff --git a/Content/StarterContent/Particles/Materials/m_flare_01.uasset b/Content/StarterContent/Particles/Materials/m_flare_01.uasset index 4b49de3..136c160 100644 --- a/Content/StarterContent/Particles/Materials/m_flare_01.uasset +++ b/Content/StarterContent/Particles/Materials/m_flare_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57377e5d237609372f0837407d7c9f35a5ba00bf81aa049102d699105af8a025 -size 14010 +oid sha256:c3da04bb974bc0a2a0d50a7ff56a3d90ba4bced7df1f9d512e034361e1e6e0ef +size 14107 diff --git a/Source/Promether/GameModeBase/Deathmatch.cpp b/Source/Promether/GameModeBase/Deathmatch.cpp index db8175f..8c6ea7e 100644 --- a/Source/Promether/GameModeBase/Deathmatch.cpp +++ b/Source/Promether/GameModeBase/Deathmatch.cpp @@ -133,7 +133,7 @@ FString ADeathmatch::InitNewPlayer(APlayerController* NewPlayerController, const //DebugPerpose if (Type == CharacterType::Lukriel) { - Type = CharacterType::Lb; + Type = CharacterType::Allium; } if (Team == TeamType::Null) { diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index 384cfa6..76e1f35 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -16,7 +16,7 @@ ADefaultPlayerCharacter::ADefaultPlayerCharacter() CameraSpringArm = CreateDefaultSubobject(TEXT("SpringArm")); CameraSpringArm->SetRelativeLocationAndRotation(FVector(0.0f, 0.0f, 0.0f), FRotator(-45.0f, 0.0f, 0.0f)); CameraSpringArm->SetAbsolute(false, true, true); - CameraSpringArm->TargetArmLength = 2000.f; + CameraSpringArm->TargetArmLength = 1000.f; CameraSpringArm->bEnableCameraLag = true; CameraSpringArm->bDoCollisionTest = false; CameraSpringArm->CameraLagSpeed = 3.0f; diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index 6e6e94b..dd7f184 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -233,17 +233,6 @@ void ADefaultPlayerController::SetupInputComponent() void ADefaultPlayerController::Skill1() { - //if (!(GetPlayerState()->Stats.Mana >= 100)) - // return; - - FVector Location = GetPawn()->GetActorLocation(); - Location.Z = 0; - - SimpleMoveToLocation(this, Location); - this->MoveToLocation(Location); - - GetPawn()->SetActorRotation((GetMouseHitLocation() - Location).Rotation()); - UE_LOG(LogTemp, Warning, TEXT("Skill1")); GetPlayerState()->SetState(ECharacterState::Attack); GetPlayerState()->SetAttackType(CooldownType::Skill1); @@ -251,14 +240,6 @@ void ADefaultPlayerController::Skill1() void ADefaultPlayerController::Skill2() { - FVector Location = GetPawn()->GetActorLocation(); - Location.Z = 0; - - SimpleMoveToLocation(this, Location); - this->MoveToLocation(Location); - - GetPawn()->SetActorRotation((GetMouseHitLocation() - Location).Rotation()); - UE_LOG(LogTemp, Warning, TEXT("Skill2")); GetPlayerState()->SetState(ECharacterState::Attack); GetPlayerState()->SetAttackType(CooldownType::Skill2); @@ -266,14 +247,6 @@ void ADefaultPlayerController::Skill2() void ADefaultPlayerController::Skill3() { - FVector Location = GetPawn()->GetActorLocation(); - Location.Z = 0; - - SimpleMoveToLocation(this, Location); - this->MoveToLocation(Location); - - GetPawn()->SetActorRotation((GetMouseHitLocation() - Location).Rotation()); - UE_LOG(LogTemp, Warning, TEXT("Skill3")); GetPlayerState()->SetState(ECharacterState::Attack); GetPlayerState()->SetAttackType(CooldownType::Skill3); @@ -281,17 +254,9 @@ void ADefaultPlayerController::Skill3() void ADefaultPlayerController::Skill4() { - FVector Location = GetPawn()->GetActorLocation(); - Location.Z = 0; - - SimpleMoveToLocation(this, Location); - this->MoveToLocation(Location); - - GetPawn()->SetActorRotation((GetMouseHitLocation() - Location).Rotation()); - UE_LOG(LogTemp, Warning, TEXT("Skill4")); GetPlayerState()->SetState(ECharacterState::Attack); - GetPlayerState()->SetAttackType(CooldownType::Skill4Started); + GetPlayerState()->SetAttackType(CooldownType::Skill4); } void ADefaultPlayerController::RuneSpell1() @@ -349,15 +314,6 @@ void ADefaultPlayerController::MoveStarted() } void ADefaultPlayerController::Move() -{ - FVector Destination = GetMouseHitLocation(); - - GetPlayerState()->SetState(ECharacterState::Moving); - SimpleMoveToLocation(this, Destination); - this->MoveToLocation(Destination); -} - -FVector ADefaultPlayerController::GetMouseHitLocation() { FHitResult HitResult; GetHitResultUnderCursor(ECollisionChannel::ECC_Visibility, true, HitResult); @@ -369,7 +325,6 @@ FVector ADefaultPlayerController::GetMouseHitLocation() ActorLocation.Z = 0; float CapsuleRadius = GetPawn()->GetCapsuleComponent()->GetScaledCapsuleRadius(); - FVector Destination = (HitResult.Location - ActorLocation).GetSafeNormal() * CapsuleRadius + HitResult.Location; DrawDebugLine(GetWorld(), ActorLocation, HitResult.Location, FColor::Blue, false, 1, 0, 1); @@ -393,7 +348,9 @@ FVector ADefaultPlayerController::GetMouseHitLocation() } } - return Destination; + GetPlayerState()->SetState(ECharacterState::Moving); + SimpleMoveToLocation(this, Destination); + this->MoveToLocation(Destination); } void ADefaultPlayerController::SimpleMoveToLocation(AController* Controller, const FVector& GoalLocation) diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.h b/Source/Promether/PlayerGeneric/DefaultPlayerController.h index 22d92c7..4b312bf 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.h @@ -47,8 +47,6 @@ public: UFUNCTION(Server, Reliable) void MoveToLocation(FVector Location); - FVector GetMouseHitLocation(); - UFUNCTION(BlueprintCallable, Category = "AI|Navigation") void SimpleMoveToLocation(AController* Controller, const FVector& Goal); diff --git a/Source/Promether/PlayerGeneric/PerformSkill.cpp b/Source/Promether/PlayerGeneric/PerformSkill.cpp deleted file mode 100644 index 1d1dd9f..0000000 --- a/Source/Promether/PlayerGeneric/PerformSkill.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "PerformSkill.h" - -// Add default functionality here for any IPerformSkill functions that are not pure virtual. diff --git a/Source/Promether/PlayerGeneric/PerformSkill.h b/Source/Promether/PlayerGeneric/PerformSkill.h deleted file mode 100644 index ee6f11b..0000000 --- a/Source/Promether/PlayerGeneric/PerformSkill.h +++ /dev/null @@ -1,28 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "UObject/Interface.h" -#include "PerformSkill.generated.h" - -// This class does not need to be modified. -UINTERFACE(MinimalAPI) -class UPerformSkill : public UInterface -{ - GENERATED_BODY() -}; - -/** - * - */ -class PROMETHER_API IPerformSkill -{ - GENERATED_BODY() - - // Add interface functions to this class. This is the class that will be inherited to implement this interface. -public: - virtual void Skill4Started() = 0; - virtual void Skill4Triggered() = 0; - virtual void Skill4Completed() = 0; -}; diff --git a/Source/Promether/PrometherEnum.h b/Source/Promether/PrometherEnum.h index 1fb193f..1fcc679 100644 --- a/Source/Promether/PrometherEnum.h +++ b/Source/Promether/PrometherEnum.h @@ -36,9 +36,7 @@ enum class CooldownType : uint8 Skill1, Skill2, Skill3, - Skill4Started, - Skill4Triggered, - Skill4Comlpleted, + Skill4, RuneSpell1, RuneSpell2, Ward,