diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index aa4856d..a41080a 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -131,9 +131,11 @@ ManualIPAddress= +Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="Bullet",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.") +Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.") +Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap),(Channel="Bullet",Response=ECR_Ignore)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="Drop",CollisionEnabled=QueryAndPhysics,bCanModify=True,ObjectTypeName="Drop",CustomResponses=,HelpMessage="Needs description") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=True,bStaticObject=False,Name="Bullet") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Block,bTraceType=True,bStaticObject=False,Name="Enemy") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="Projectile") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel4,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Drop") +EditProfiles=(Name="NoCollision",CustomResponses=((Channel="Bullet",Response=ECR_Ignore))) +EditProfiles=(Name="OverlapAll",CustomResponses=((Channel="Bullet",Response=ECR_Overlap))) +EditProfiles=(Name="CharacterMesh",CustomResponses=((Channel="Bullet",Response=ECR_Ignore))) diff --git a/Content/Legumix/Drops/BP_DropRevolver.uasset b/Content/Legumix/Drops/BP_DropRevolver.uasset index 74a39c7..a4728c9 100644 --- a/Content/Legumix/Drops/BP_DropRevolver.uasset +++ b/Content/Legumix/Drops/BP_DropRevolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e56ca9e4a3f512aefb7d9d1a0914c3f00a7b5ab18d6c32ac6d30e57be7fabd6 -size 34961 +oid sha256:cfee965cd84a5caa4fd913f387ae7c13cd4f541d04c4288a709d64703652b721 +size 35231 diff --git a/Content/Legumix/Drops/BP_DropShotgun.uasset b/Content/Legumix/Drops/BP_DropShotgun.uasset index 0518f37..8da0127 100644 --- a/Content/Legumix/Drops/BP_DropShotgun.uasset +++ b/Content/Legumix/Drops/BP_DropShotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c323a5669a06a5314d372d57edcd1638bbb828178a9e7c9b6299d245dc6f3794 -size 35513 +oid sha256:a8ef945ed99c81f382c62241939f189a0f5ea6284817a7e98ef5250533e8a1fd +size 35768 diff --git a/Content/Legumix/Drops/BP_HealthPack.uasset b/Content/Legumix/Drops/BP_HealthPack.uasset index 208c515..103847f 100644 --- a/Content/Legumix/Drops/BP_HealthPack.uasset +++ b/Content/Legumix/Drops/BP_HealthPack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e2f39e549b5f598278cb14832e87390b3c05da6d4a7e07daa45e29ed4b6af04 -size 36664 +oid sha256:bd25a277922168a5f19ae9d29e8d606180d5fab78f2a2b089500fe65aa6ba76e +size 36931 diff --git a/Source/LegumeMix/Private/LMItemDrop.cpp b/Source/LegumeMix/Private/LMItemDrop.cpp index 36448f4..af6ac13 100644 --- a/Source/LegumeMix/Private/LMItemDrop.cpp +++ b/Source/LegumeMix/Private/LMItemDrop.cpp @@ -14,6 +14,7 @@ ALMItemDrop::ALMItemDrop() void ALMItemDrop::BeginPlay() { Super::BeginPlay(); + SpawnLocation = GetActorLocation(); GetWorldTimerManager().SetTimer(DespawnHandle, this, &ALMItemDrop::Despawn, TimeBeforeDespawn); } diff --git a/Source/LegumeMix/Public/LMItemDrop.h b/Source/LegumeMix/Public/LMItemDrop.h index f11843c..808a1ae 100644 --- a/Source/LegumeMix/Public/LMItemDrop.h +++ b/Source/LegumeMix/Public/LMItemDrop.h @@ -24,6 +24,9 @@ private: UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Legumix, meta = (AllowPrivateAccess = true)) TObjectPtr StaticMeshComponent; + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Legumix, meta = (AllowPrivateAccess = true)) + FVector SpawnLocation; + public: ALMItemDrop(); virtual void BeginPlay() override; @@ -34,6 +37,8 @@ public: UFUNCTION(BlueprintImplementableEvent) void OnPackConsumed(); + FVector GetSpawnLocation() { return SpawnLocation; } + protected: UFUNCTION(BlueprintCallable) void Despawn();