Merge pull request #55 from yxue5/Issue17

Finished Issue 17
yxue5 · Apr 4, 2018 · f78ee52 · f78ee52
2 parents 4252e79 + 1fbbfb7
commit f78ee52
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 6 deletions.
diff --git a/ProjectEroica/Content/Blueprints/BP_Enemy.uasset b/ProjectEroica/Content/Blueprints/BP_Enemy.uasset
diff --git a/ProjectEroica/Content/Blueprints/BP_MyCharacter.uasset b/ProjectEroica/Content/Blueprints/BP_MyCharacter.uasset
diff --git a/ProjectEroica/Content/Map_Assets/ShipMap.umap b/ProjectEroica/Content/Map_Assets/ShipMap.umap
diff --git a/ProjectEroica/Content/Map_Assets/ShipMap_BuiltData.uasset b/ProjectEroica/Content/Map_Assets/ShipMap_BuiltData.uasset
diff --git a/ProjectEroica/Source/ProjectEroica/AnimInstanceKisa.cpp b/ProjectEroica/Source/ProjectEroica/AnimInstanceKisa.cpp
@@ -46,7 +46,7 @@ void UAnimInstanceKisa::HandleState(FString newState) {
 		else if (newState == "JumpAttack") {
 			UGameplayStatics::PlaySound2D(this, JumpAttackSound);
 		}
-		FString path = "AnimSequence'/Game/Art_Assets/Animations/" + newState + "." + newState + "'";
+		FString path = "AnimSequence'/Game/Art_Assets/Animations/" + newState + "." + newState + "'/";
 		ourAnimation = Cast<UAnimSequence>(StaticLoadObject(UAnimSequence::StaticClass(), NULL, *path));
 		State = newState;
 		playOurAnimation();

diff --git a/ProjectEroica/Source/ProjectEroica/AnimInstanceKisa.h b/ProjectEroica/Source/ProjectEroica/AnimInstanceKisa.h
@@ -48,7 +48,7 @@ class PROJECTEROICA_API UAnimInstanceKisa : public UAnimInstance
 		USoundBase* PainSound;
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Animations")
-	UAnimSequence* ourAnimation = Cast<UAnimSequence>(StaticLoadObject(UAnimSequence::StaticClass(), NULL, TEXT("AnimSequence'/Game/Art_Assets/Animations/Idle.Idle'")));
+	UAnimSequence* ourAnimation = Cast<UAnimSequence>(StaticLoadObject(UAnimSequence::StaticClass(), NULL, TEXT("AnimSequence'/Game/Art_Assets/Animations/Idle.Idle'/")));
 
 	//plays the actual animation
 	UFUNCTION(BlueprintImplementableEvent,BlueprintCallable)

diff --git a/ProjectEroica/Source/ProjectEroica/TP_SideScrollerCharacter.cpp b/ProjectEroica/Source/ProjectEroica/TP_SideScrollerCharacter.cpp
@@ -21,6 +21,7 @@
 
 ATP_SideScrollerCharacter::ATP_SideScrollerCharacter()
 {
+	State = Idle;
 	// Don't rotate when the controller rotates.
 	bUseControllerRotationPitch = false;
 	bUseControllerRotationYaw = false;
@@ -99,6 +100,7 @@ void ATP_SideScrollerCharacter::BeginPlay()
 		CharWeapon->wepOwner = this;
 		CharWeapon->AttachToComponent(GetMesh(),FAttachmentTransformRules::SnapToTargetIncludingScale, FName("WeaponSocket"));
 	}
+	State = Idle;
 	//Sets up connections to Animation Instance
 	AnimInst = Cast<UAnimInstanceKisa>(GetMesh()->GetAnimInstance());
 	AnimInst->owningChar = this;
@@ -215,22 +217,28 @@ void ATP_SideScrollerCharacter::Attack()
 void ATP_SideScrollerCharacter::handleAttack(float dmg, FString stunType, float stunDuration, FVector force, float attackDirection)
 {
 	//position the character to the direction of the attack
-	float knockupOffset = 1;
+	float knockupDirection = 1;
 	if (attackDirection < 1) {
 		SetActorRotation(FRotator(0, 0, 0));
-		knockupOffset = -1;
+		knockupDirection = -1;
 	}
 	else SetActorRotation(FRotator(0, 180, 0));
 	UGameplayStatics::PlaySound2D(this, AnimInst->HitSound);
 	UGameplayStatics::PlaySound2D(this, AnimInst->PainSound);
 	Stats->hp -= dmg;
 	State = stunType;
-
+	//if we're dead then disbale input
+	if (Stats->hp <= 0) {
+		//State = Death;
+		//PrimaryActorTick.bCanEverTick = false;
+		//DisableInput(ourPlayer);
+		//UE_LOG(LogTemp, Warning, TEXT("Dead!"));
+	}
 	if (State == Stunned) {
 		GetWorld()->GetTimerManager().SetTimer(StunHandle, this, &ATP_SideScrollerCharacter::EndStun, stunDuration, false);
 	}
 	else if (State == Knockup) {
-		force.Y = force.Y *knockupOffset;
+		force.Y = force.Y *knockupDirection;
 		LaunchCharacter(force,true,true);
 //UE_LOG(LogTemp, Warning, TEXT("knockup Y %f"), force.Y );
 		//UE_LOG(LogTemp, Warning, TEXT("knockup Z %f"), force.Z);

diff --git a/ProjectEroica/Source/ProjectEroica/TP_SideScrollerCharacter.h b/ProjectEroica/Source/ProjectEroica/TP_SideScrollerCharacter.h
@@ -48,6 +48,7 @@ class ATP_SideScrollerCharacter : public ACharacter
 	FString Combo4 = "Combo4";
 	FString Combo5 = "Combo5";
 	FString Land = "Land";
+	FString Death = "Death";
 
 	//sets char back to idle when appropriate
 	UFUNCTION()