Implemented Greasy Rick Checkpoints
This commit is contained in:
parent
e47172b790
commit
94b22abef0
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:6953fab657d76ea4a5f6ecefddd23ca6f9338af8b71624a86e5b8aa85dfb47b3
|
oid sha256:5116f4dc040f1ca11d223113b30367becef3f6ff4d3e194ab165fe9f6b2088ee
|
||||||
size 76517
|
size 153438
|
||||||
|
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BTT/BTT_ArrivedOutsideMarket.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BTT/BTT_ArrivedOutsideMarket.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5e006907ba22b71d8f79c763857bba9813f901785efc5a6315a458d803ca8e1f
|
|
||||||
size 26328
|
|
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BT_GreasyRick.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/BT_GreasyRick.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickDefault.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickDefault.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Dialogue/DT_GreasyRickIntro.uasset
(Stored with Git LFS)
Binary file not shown.
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:44a8880304314cde96c89b29b2c9f5c7330e59f389529862ac589de57db16774
|
||||||
|
size 16962
|
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/GreasyRick/Waypoint/BP_GreasyRickWaypoint.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_Apartment.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_Apartment.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest1.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest2.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/Examples/OWCP_InteractTest2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ffc0494e896f842e6d6baa4953b6f317c3e2479d2b672611671fdc12fb184555
|
|
||||||
size 35802
|
|
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_FollowGreasyRick.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:253f8ebabbd32167aa4ecd182352cb52f1c337502351a1bd8f38414f6b3a9d61
|
|
||||||
size 29197
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:1c22f439331d8787e77de31ada2719cc99dd341a7a0564eeb9bd3f8fcafcc2f2
|
|
||||||
size 38592
|
|
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e297e190c30fc85fb8f8807ecef1e48f9bb32202cae96ead763e0d3b7c989177
|
||||||
|
size 60203
|
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_TalkWithStranger.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:a67204b6b65b0b19778380561dee8ca2dd3af99541fdacb2b2e44ac185382ea5
|
oid sha256:1a91be4f194b7201af29ce132c115235a7bd582e5980141cad653b6091ca2070
|
||||||
size 26877
|
size 26252
|
||||||
|
BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Waypoint/WBP_WaypointWidget.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Dialogue/Testing/Waypoint/WBP_TempMayorWaypoint.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Dialogue/Testing/Waypoint/WBP_TempMayorWaypoint.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4e442a95ad15525835a7f5ba2bfa243ddec48b95d9c2575d09b111d42bc01f37
|
oid sha256:ce018854123dcc94eb0bf5bbce589f6902f0514415946e76b97e4fcfcd66d5c4
|
||||||
size 293624422
|
size 293642302
|
||||||
|
BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
(Stored with Git LFS)
Binary file not shown.
@ -21,6 +21,8 @@ void AWaypointActor::SetupWaypoint_Implementation(UTexture2D* Icon, const FStrin
|
|||||||
ScalingMagnitude = (ScaleAtMaxDist - ScaleAtMinDist) / (MaxDist - MinDist);
|
ScalingMagnitude = (ScaleAtMaxDist - ScaleAtMinDist) / (MaxDist - MinDist);
|
||||||
ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude);
|
ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude);
|
||||||
|
|
||||||
|
if (!SpawnMiniWaypoint) return;
|
||||||
|
|
||||||
MiniWaypoint = CreateWidget<UMiniWaypoint>(GetWorld(), MiniWaypointClass);
|
MiniWaypoint = CreateWidget<UMiniWaypoint>(GetWorld(), MiniWaypointClass);
|
||||||
MiniWaypoint->AddToViewport(0);
|
MiniWaypoint->AddToViewport(0);
|
||||||
MiniWaypoint->WorldLoc = this->GetActorLocation();
|
MiniWaypoint->WorldLoc = this->GetActorLocation();
|
||||||
@ -37,11 +39,11 @@ void AWaypointActor::Tick(float DeltaTime)
|
|||||||
if (SightCheck())
|
if (SightCheck())
|
||||||
{
|
{
|
||||||
UpdateVisibility(true);
|
UpdateVisibility(true);
|
||||||
MiniWaypoint->UpdateVisibility(false);
|
if (IsValid(MiniWaypoint)) MiniWaypoint->UpdateVisibility(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
UpdateVisibility(false);
|
UpdateVisibility(false);
|
||||||
MiniWaypoint->UpdateVisibility(true);
|
if (IsValid(MiniWaypoint)) MiniWaypoint->UpdateVisibility(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AWaypointActor::SightCheck()
|
bool AWaypointActor::SightCheck()
|
||||||
|
@ -53,10 +53,13 @@ public:
|
|||||||
// Sets default values for this actor's properties
|
// Sets default values for this actor's properties
|
||||||
AWaypointActor();
|
AWaypointActor();
|
||||||
|
|
||||||
|
UPROPERTY(BlueprintReadWrite)
|
||||||
|
bool SpawnMiniWaypoint = true;
|
||||||
|
|
||||||
// Called every frame
|
// Called every frame
|
||||||
virtual void Tick(float DeltaTime) override;
|
virtual void Tick(float DeltaTime) override;
|
||||||
|
|
||||||
UFUNCTION(BlueprintNativeEvent)
|
UFUNCTION(BlueprintNativeEvent, BlueprintCallable)
|
||||||
void SetupWaypoint(UTexture2D* Icon, const FString& Desc);
|
void SetupWaypoint(UTexture2D* Icon, const FString& Desc);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -20,7 +20,7 @@ class ENDLESSVENDETTA_API UAC_Dialogue : public UActorComponent
|
|||||||
public:
|
public:
|
||||||
void Interact() const;
|
void Interact() const;
|
||||||
|
|
||||||
UPROPERTY(BlueprintReadOnly, EditDefaultsOnly, Category = "Dialogue")
|
UPROPERTY(BlueprintReadWrite, EditDefaultsOnly, Category = "Dialogue")
|
||||||
UDialogueTree* DialogueTree;
|
UDialogueTree* DialogueTree;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user