diff --git a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset index e7677fc..71bf8ea 100644 --- a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset +++ b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e168c1d918f01109b4e696f17435306d9a92ae422a4b0fa14d5df7306e874e51 -size 150369 +oid sha256:1a760f33857abf7a9c973298ff9d934dae107b421d1f0eebf50a9c995c41425b +size 147147 diff --git a/Content/Character/Allium/Alium_Q.uasset b/Content/Character/Allium/Alium_Q.uasset index 500b1b8..df6fc39 100644 --- a/Content/Character/Allium/Alium_Q.uasset +++ b/Content/Character/Allium/Alium_Q.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f87efd665635b197d7539eb84b3af44e7bbd49b44cf16b064202b6ddb98195e6 -size 174779 +oid sha256:b1db0f5e39e4d320a168f824b5d4200c506214dbce935ef99d4503535ac392b8 +size 175065 diff --git a/Content/Character/Allium/Animation/ABP_Allium.uasset b/Content/Character/Allium/Animation/ABP_Allium.uasset index f16db0a..24876a7 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:b5f2e6b884188dbc9492b89c93ccaa4bcc38f64dd55b6814b88dc8247b41f373 -size 311396 +oid sha256:e50dde475d24abff95d5c3cb082b61c97a08ade22dac210b32104447ad5d069f +size 311029 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index a4bd235..77208a8 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:f803534a39fc1b5e88658ff97b5d44a381f50ea8639d13c526fe2f4d63896221 -size 427940 +oid sha256:4abe4c8244b4d339d5cf5a7780f3624cc0a93b7dea664bf28b9dd54149091ad1 +size 434066 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 741a864..ea54857 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:1b048c4e8e8151d2508f801618ac6498733710db325cb5a8369f247b3b89f7e6 -size 411075 +oid sha256:5f2710dba726be43ec6aa657b78e64c04994f74957e89cb0dfa2b06bec4bf1ea +size 411719 diff --git a/Content/Character/Lb/BaseArrow.uasset b/Content/Character/Lb/BaseArrow.uasset index e429625..63c659c 100644 --- a/Content/Character/Lb/BaseArrow.uasset +++ b/Content/Character/Lb/BaseArrow.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3acb4ae3753750e1faaf13646b4fcc7614d6f4351c307f8ccb85479dc16ba48 -size 239209 +oid sha256:5757793046b6c9799196b88682251317dc987f7ec724d850a39a47976f200793 +size 275921 diff --git a/Content/Character/Lb/Effect/T_H_A.uasset b/Content/Character/Lb/Effect/T_H_A.uasset deleted file mode 100644 index 1d6473b..0000000 --- a/Content/Character/Lb/Effect/T_H_A.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b112ad2775a4b88fce326ca92c917862f929f7888d0deb0134df60e8b1483b97 -size 56472 diff --git a/Content/Character/Lb/Effect/T_H_E.uasset b/Content/Character/Lb/Effect/T_H_E.uasset deleted file mode 100644 index 7995a44..0000000 --- a/Content/Character/Lb/Effect/T_H_E.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ee28e8a893a9292ed773f1c1fe3b6a9faf16cd3da1509dbf59ac76959ae52f0 -size 130227 diff --git a/Content/Character/Lb/Effect/T_H_Q_Burn.uasset b/Content/Character/Lb/Effect/T_H_Q_Burn.uasset deleted file mode 100644 index dfce2e1..0000000 --- a/Content/Character/Lb/Effect/T_H_Q_Burn.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5ca870e555af208475b59362c086b178302c0fbc86ad4588d4cdb1bbc0fd0fe -size 250968 diff --git a/Content/Character/Lb/Effect/T_H_Q_shoot.uasset b/Content/Character/Lb/Effect/T_H_Q_shoot.uasset deleted file mode 100644 index feebed9..0000000 --- a/Content/Character/Lb/Effect/T_H_Q_shoot.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a78638f20da7095eabd8f7affc624ff63503b2abb176bce7be99bbea850d1360 -size 116772 diff --git a/Content/Character/Lb/Effect/T_H_R_Boom.uasset b/Content/Character/Lb/Effect/T_H_R_Boom.uasset deleted file mode 100644 index 7635caf..0000000 --- a/Content/Character/Lb/Effect/T_H_R_Boom.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfe895df99726e2428967738c5ab530b87af29bf7af5c35ef646692bae92bc1e -size 682182 diff --git a/Content/Character/Lb/Effect/T_H_R_Shoot.uasset b/Content/Character/Lb/Effect/T_H_R_Shoot.uasset deleted file mode 100644 index f113ebf..0000000 --- a/Content/Character/Lb/Effect/T_H_R_Shoot.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cd74bf56b73dde55472eeab867dc85a18bfd621560675eaeed5f4e7ba84209f -size 537995 diff --git a/Content/Character/Lb/LB_BaseAttack.uasset b/Content/Character/Lb/LB_BaseAttack.uasset deleted file mode 100644 index 6ca241b..0000000 --- a/Content/Character/Lb/LB_BaseAttack.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d419f43da436ee05cb4260fa371e1563195511239ccd3d7eef3e4f2ddaf5bef6 -size 95714 diff --git a/Content/Character/Lb/LB_Q_Arrow.uasset b/Content/Character/Lb/LB_Q_Arrow.uasset index 78ac326..91dab59 100644 --- a/Content/Character/Lb/LB_Q_Arrow.uasset +++ b/Content/Character/Lb/LB_Q_Arrow.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88036e86848fff2d6195e918b487cdc024dcf9c51fb8c84eb7403c4eb588d630 -size 170348 +oid sha256:b9b9ed770c2a0c5abd4c8bb707344a1131d18c831ff391d07f4dd4ed5de7753f +size 200239 diff --git a/Content/Character/Lb/sound/T_H_A.uasset b/Content/Character/Lb/sound/T_H_A.uasset deleted file mode 100644 index a49d832..0000000 --- a/Content/Character/Lb/sound/T_H_A.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5586f0c63780a6b61e3fc9f226ad95a4fcd321a71237313f89bd0ea0600bf5b5 -size 56514 diff --git a/Content/Character/Lb/sound/T_H_E.uasset b/Content/Character/Lb/sound/T_H_E.uasset deleted file mode 100644 index 28e5f19..0000000 --- a/Content/Character/Lb/sound/T_H_E.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9935c56be74508dcc770bcc888f8b4b9c589a8d31762119528d81b02518e0c5 -size 130225 diff --git a/Content/Character/Lb/sound/T_H_Q_Burn.uasset b/Content/Character/Lb/sound/T_H_Q_Burn.uasset deleted file mode 100644 index 4d287c3..0000000 --- a/Content/Character/Lb/sound/T_H_Q_Burn.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ff27ee63800abfd54cfc59f3309cefad0a652ef11e064e9d8e2882f76023f18 -size 251009 diff --git a/Content/Character/Lb/sound/T_H_Q_shoot.uasset b/Content/Character/Lb/sound/T_H_Q_shoot.uasset deleted file mode 100644 index e4dd6f4..0000000 --- a/Content/Character/Lb/sound/T_H_Q_shoot.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3160f0255d0f497da93468182a85f0f9241b97fc5de89231cdd0129b73055fbb -size 116814 diff --git a/Content/Character/Lb/sound/T_H_R_Boom.uasset b/Content/Character/Lb/sound/T_H_R_Boom.uasset deleted file mode 100644 index 1863d10..0000000 --- a/Content/Character/Lb/sound/T_H_R_Boom.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd150f877afdcec824f5f8638dcbc506e4a93fa167a39e30274e6be26b10df37 -size 682224 diff --git a/Content/Character/Lb/sound/T_H_R_Shoot.uasset b/Content/Character/Lb/sound/T_H_R_Shoot.uasset deleted file mode 100644 index ed21d94..0000000 --- a/Content/Character/Lb/sound/T_H_R_Shoot.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:328e6cce6dd428f683b94eb9f527558b57851ae8e96842c78bbacb82c463e137 -size 537993 diff --git a/Content/Character/Monster/Knight/BP_Knignt.uasset b/Content/Character/Monster/Knight/BP_Knignt.uasset index f06ed4b..90b2e92 100644 --- a/Content/Character/Monster/Knight/BP_Knignt.uasset +++ b/Content/Character/Monster/Knight/BP_Knignt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e491fc22d201d812f36fa28d36709371273eec9a73d66d2bb86c5f1ce663d26 -size 25898 +oid sha256:8ac3ac5acab72816e3ac2450cb666ac21cb9600d115957dc41c3ed78c3985588 +size 25886 diff --git a/Content/Character/Riana/BP_Riana.uasset b/Content/Character/Riana/BP_Riana.uasset index 9f33c31..b997190 100644 --- a/Content/Character/Riana/BP_Riana.uasset +++ b/Content/Character/Riana/BP_Riana.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec58f28eba10b40515b006ddc6d28020ebd92ef641f13d6f6624b42356d58532 -size 36945 +oid sha256:56c4599656ef2992ff3e59d26adfd38bdce53ddded397b7671a4cdf4726f10c4 +size 37446 diff --git a/Content/Effect/AliumQ/Knife1.uasset b/Content/Effect/AliumQ/Knife1.uasset deleted file mode 100644 index cd7de68..0000000 --- a/Content/Effect/AliumQ/Knife1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61e889e853480031a870a8627a4d6c4de77a541dda93b39aae022befbd2801db -size 295484 diff --git a/Content/Effect/CC.uasset b/Content/Effect/CC.uasset deleted file mode 100644 index b034c8b..0000000 --- a/Content/Effect/CC.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e1f53ef1caf6952425675f5a542af654a8f61eb5aba7c18da678c6799a74fec -size 73954 diff --git a/Content/Effect/ETC/Hit_Nomal.uasset b/Content/Effect/ETC/Hit_Nomal.uasset index a3d3e40..a193a3c 100644 --- a/Content/Effect/ETC/Hit_Nomal.uasset +++ b/Content/Effect/ETC/Hit_Nomal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:377e657ed78b7e160b2ef5584f567fd59aafebc13ce03474b7fab674a7daf0f1 -size 23009 +oid sha256:bfa84589c2b268acfda8e0113a8974c1b3f2df9699b5637ead1d7767b6280939 +size 23415 diff --git a/Content/Effect/LB/Sound/T_H_W.uasset b/Content/Effect/LB/Sound/T_H_W.uasset deleted file mode 100644 index 4508c04..0000000 --- a/Content/Effect/LB/Sound/T_H_W.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4526c62252ea1d87451fc4bccbf76e31ea7800768b9ea27b0d02b2d953b42a6e -size 508580 diff --git a/Content/Effect/dust.uasset b/Content/Effect/dust.uasset deleted file mode 100644 index 72b4cf0..0000000 --- a/Content/Effect/dust.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce231ed8a4ee66c55e32527d3b35b9c75e7617f1d349a9ad72737b33ea36c99d -size 47039 diff --git a/Content/Effect/particle_test/Content/Cursor/Untitled-1.uasset b/Content/Effect/particle_test/Content/Cursor/Untitled-1.uasset deleted file mode 100644 index cd1b268..0000000 --- a/Content/Effect/particle_test/Content/Cursor/Untitled-1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c0951bf44434b34a1dffd0b79d0488f54814bbb2bb8fc98c461e2711964807a -size 18543 diff --git a/Content/Effect/tnt.uasset b/Content/Effect/tnt.uasset deleted file mode 100644 index 08fabdb..0000000 --- a/Content/Effect/tnt.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f509cf5e1734fb8eb06305bf48506f5e7ee993ce3663071c57c1cf3294081777 -size 20120 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 2acd716..3aa4eb0 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:4b191642ee0361ce3ac071af00afe325979ec480ca17a8dbcb7295cf58138169 -size 179728 +oid sha256:9d3f1fd3ead967bc9e5d347e9c43f478c8d17749652ed17386f041ee55025ca6 +size 180534 diff --git a/Source/Promether/DamageType/HomingAttack.cpp b/Source/Promether/DamageType/HomingAttack.cpp index cf70434..e089a66 100644 --- a/Source/Promether/DamageType/HomingAttack.cpp +++ b/Source/Promether/DamageType/HomingAttack.cpp @@ -12,11 +12,11 @@ AHomingAttack::AHomingAttack() // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; ProjectileMovement = CreateDefaultSubobject(TEXT("ProjectileMovement")); - ProjectileMovement->InitialSpeed = 200; - ProjectileMovement->MaxSpeed = 200; + ProjectileMovement->InitialSpeed = 0; + ProjectileMovement->MaxSpeed = 1000; ProjectileMovement->ProjectileGravityScale = 0; ProjectileMovement->bIsHomingProjectile = true; - ProjectileMovement->HomingAccelerationMagnitude = 200; + ProjectileMovement->HomingAccelerationMagnitude = 10000; ProjectileMovement->Velocity = { 0, 0, 0 }; ProjectileMovement->bRotationFollowsVelocity = true; } @@ -31,6 +31,7 @@ void AHomingAttack::BeginPlay() if (!State->GetCurrentAttackTarget()) { UE_LOG(LogTemp, Error, TEXT("No Target")); + Destroy(); return; } diff --git a/Source/Promether/GameModeBase/Deathmatch.cpp b/Source/Promether/GameModeBase/Deathmatch.cpp index 8c6ea7e..db8175f 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::Allium; + Type = CharacterType::Lb; } if (Team == TeamType::Null) {