diff --git a/SeagullGame/Content/Items/BPI_Bagutte.uasset b/SeagullGame/Content/Items/BPI_Bagutte.uasset index 481fd52..853265d 100644 --- a/SeagullGame/Content/Items/BPI_Bagutte.uasset +++ b/SeagullGame/Content/Items/BPI_Bagutte.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:170430b667e5186c6dc253c0b3aa6ae2e51b2f1b763146964eecdf4e9e192ee5 -size 27890 +oid sha256:5e1d673882f86f12383da7c6862c6bf87d518f3e7c955676db787d259d760ee4 +size 27898 diff --git a/SeagullGame/Content/Items/BPI_Bagutte_NP.uasset b/SeagullGame/Content/Items/BPI_Bagutte_NP.uasset index a8d3508..2819f54 100644 --- a/SeagullGame/Content/Items/BPI_Bagutte_NP.uasset +++ b/SeagullGame/Content/Items/BPI_Bagutte_NP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e3e5974e84256d63672f8e1ff982c2423b395ee50c176632f6e3925f4fc46c7 -size 27169 +oid sha256:20cab952828953dd217bf488763370844cfe048591cde32079ad427963bd50af +size 27177 diff --git a/SeagullGame/Content/Items/BPI_Bagutte_T.uasset b/SeagullGame/Content/Items/BPI_Bagutte_T.uasset index 4ffebcc..8607551 100644 --- a/SeagullGame/Content/Items/BPI_Bagutte_T.uasset +++ b/SeagullGame/Content/Items/BPI_Bagutte_T.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5062681aee4cddd69dcd1e8c42b02c347fbf54a416fa18a7fc0b795fabdbc5da -size 27187 +oid sha256:b4fd97c2350e551586aed94436c322bf1a410bfa493e1f4b4fc829c452ff957f +size 27189 diff --git a/SeagullGame/Content/Items/BPI_Bread.uasset b/SeagullGame/Content/Items/BPI_Bread.uasset index f3ddb51..0f3b584 100644 --- a/SeagullGame/Content/Items/BPI_Bread.uasset +++ b/SeagullGame/Content/Items/BPI_Bread.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:454c3b0ab51ef9f582a78952af60cffaf104c98c7053a73c0d33f0ec34ebdf41 -size 28161 +oid sha256:8d2a4c80093ce40834eca175e5f3d2cc4ab12923d9854dc46ba0632d74ca1ed0 +size 28195 diff --git a/SeagullGame/Content/Items/BPI_Bread_NP.uasset b/SeagullGame/Content/Items/BPI_Bread_NP.uasset index 06e6c22..558c255 100644 --- a/SeagullGame/Content/Items/BPI_Bread_NP.uasset +++ b/SeagullGame/Content/Items/BPI_Bread_NP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46e0c462b5700e87fac59f955c70dd60d7b0ffba3cc054f864f0495d639247ea -size 27440 +oid sha256:fcdb95c5272468acfc0238067e16f3096625294c8f55990d167c2d6b101b8681 +size 27474 diff --git a/SeagullGame/Content/Items/BPI_Bread_T.uasset b/SeagullGame/Content/Items/BPI_Bread_T.uasset index 0655d88..618b45c 100644 --- a/SeagullGame/Content/Items/BPI_Bread_T.uasset +++ b/SeagullGame/Content/Items/BPI_Bread_T.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad2440ad956a34b4e5ddb4476960660c18e607018f9c6fa66c8c59edef469166 -size 27163 +oid sha256:0555f96382f4913bec80595ce38e486bf649af0ea2829b2524559cdc7051757b +size 27260 diff --git a/SeagullGame/Content/Mart.umap b/SeagullGame/Content/Mart.umap index 7cf4b57..6d55194 100644 --- a/SeagullGame/Content/Mart.umap +++ b/SeagullGame/Content/Mart.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:836eefba01b5326cfc46e0eab6bb04e672928084cad6b057a2c74753c02a4fc6 -size 271636 +oid sha256:d12ff244f763e1091c68c328d37349cb73bbb65114fa5b7f46aa612a778d2200 +size 274524 diff --git a/SeagullGame/Content/Ossie_Props/Broom.uasset b/SeagullGame/Content/Ossie_Props/Broom.uasset index 4633715..0b8f199 100644 --- a/SeagullGame/Content/Ossie_Props/Broom.uasset +++ b/SeagullGame/Content/Ossie_Props/Broom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:915d76cf9af9b196ed9e64cf5c6745730b9d5befe39da4fdc7e90784daaca37a -size 21993 +oid sha256:eb76d4a859c5288547042137c466d44c60ab65ce7ca9fc218fd09c8652c4f3cd +size 21938 diff --git a/SeagullGame/Content/Ossie_Props/Car.uasset b/SeagullGame/Content/Ossie_Props/Car.uasset index 58d1c48..b01ffeb 100644 --- a/SeagullGame/Content/Ossie_Props/Car.uasset +++ b/SeagullGame/Content/Ossie_Props/Car.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:211b2b59f9f5ffbe61fc438c718be6edb2c8b828feefc80a32d5bc73483492cf -size 86017 +oid sha256:161b34e2c515c41c94bed53c10abafafaf601506b995aebf39b2af96483a64a1 +size 85743 diff --git a/SeagullGame/Content/Ossie_Props/M_Car.uasset b/SeagullGame/Content/Ossie_Props/M_Car.uasset deleted file mode 100644 index 4890d81..0000000 --- a/SeagullGame/Content/Ossie_Props/M_Car.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e17f7b85c6c3ae4c10fc612bfe6bb6c2b94ab423b524ae3617052af87811418 -size 7594 diff --git a/SeagullGame/Content/Ossie_Props/M_MopBucket.uasset b/SeagullGame/Content/Ossie_Props/M_MopBucket.uasset deleted file mode 100644 index a34bddf..0000000 --- a/SeagullGame/Content/Ossie_Props/M_MopBucket.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f09bf0c882ec66a108827677782f8765499033eff1005a42cf11eab5d0660e7a -size 7811 diff --git a/SeagullGame/Content/Ossie_Props/M_MopRed.uasset b/SeagullGame/Content/Ossie_Props/M_MopRed.uasset deleted file mode 100644 index 9233e92..0000000 --- a/SeagullGame/Content/Ossie_Props/M_MopRed.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3d97ddce7e47fd03ad02091581f7439e723a78d351b6e69898a37112374cd8e -size 7582 diff --git a/SeagullGame/Content/Ossie_Props/M_MopWhite.uasset b/SeagullGame/Content/Ossie_Props/M_MopWhite.uasset deleted file mode 100644 index 7f131d3..0000000 --- a/SeagullGame/Content/Ossie_Props/M_MopWhite.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2833b21c5cedf329dc9ef04824921cae06cdabf1d57c2d7f26e0082830b4a05d -size 7965 diff --git a/SeagullGame/Content/Ossie_Props/M_StickBrown.uasset b/SeagullGame/Content/Ossie_Props/M_StickBrown.uasset deleted file mode 100644 index 5f1e6c5..0000000 --- a/SeagullGame/Content/Ossie_Props/M_StickBrown.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9f5e1c866c8c591e1f022d3b8b95e61d95adafa017bd2145b975d16af273618 -size 7638 diff --git a/SeagullGame/Content/Ossie_Props/M_WetFloor.uasset b/SeagullGame/Content/Ossie_Props/M_WetFloor.uasset deleted file mode 100644 index 2963776..0000000 --- a/SeagullGame/Content/Ossie_Props/M_WetFloor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56716556bc4814f73aceb7ab45699f9bbae89d4174e1f51780573234407e787b -size 12430 diff --git a/SeagullGame/Content/Ossie_Props/Mop.uasset b/SeagullGame/Content/Ossie_Props/Mop.uasset index 7342680..ab16813 100644 --- a/SeagullGame/Content/Ossie_Props/Mop.uasset +++ b/SeagullGame/Content/Ossie_Props/Mop.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c1a45c42a891aab127474d08351b7691443251d07f002b2388d10606f3619cc -size 27132 +oid sha256:78f055160aae3d217979b940bd042caafecffa15f676c00a1672e70b33e545e8 +size 27172 diff --git a/SeagullGame/Content/Ossie_Props/MopBucket.uasset b/SeagullGame/Content/Ossie_Props/MopBucket.uasset index 2ef6a95..8c80502 100644 --- a/SeagullGame/Content/Ossie_Props/MopBucket.uasset +++ b/SeagullGame/Content/Ossie_Props/MopBucket.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b80daef228f356ebb528fb119ba4b7d85322a313255e71fe90d6e1bdf8f3908 -size 55537 +oid sha256:dde90820cd623236e843c38ec0a4e4cb7d7be09d46e3f72f7a8369248878d014 +size 55450 diff --git a/SeagullGame/Content/Ossie_Props/Texture/M_Car.uasset b/SeagullGame/Content/Ossie_Props/Texture/M_Car.uasset new file mode 100644 index 0000000..43b0961 --- /dev/null +++ b/SeagullGame/Content/Ossie_Props/Texture/M_Car.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f301ec4ad204f579e5caa5961de452a21b16e2e23fbfe5e0f1aae80a99d760d +size 7643 diff --git a/SeagullGame/Content/Ossie_Props/Texture/M_MopBucket.uasset b/SeagullGame/Content/Ossie_Props/Texture/M_MopBucket.uasset new file mode 100644 index 0000000..5cc2585 --- /dev/null +++ b/SeagullGame/Content/Ossie_Props/Texture/M_MopBucket.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3efad940008b36b2d97f5bfbe2dfa962c16426599ec254458ee8ae945a80d47c +size 7860 diff --git a/SeagullGame/Content/Ossie_Props/Texture/M_MopRed.uasset b/SeagullGame/Content/Ossie_Props/Texture/M_MopRed.uasset new file mode 100644 index 0000000..f0965c6 --- /dev/null +++ b/SeagullGame/Content/Ossie_Props/Texture/M_MopRed.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72c859c304b43ce90801b14721af58b46d277a702e3e9abda11416b656853a5b +size 7631 diff --git a/SeagullGame/Content/Ossie_Props/Texture/M_MopWhite.uasset b/SeagullGame/Content/Ossie_Props/Texture/M_MopWhite.uasset new file mode 100644 index 0000000..c83ce61 --- /dev/null +++ b/SeagullGame/Content/Ossie_Props/Texture/M_MopWhite.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b359b541bb06b7847998f7a4253a780d6ed4019daebdae473053ce6a231f0111 +size 8014 diff --git a/SeagullGame/Content/Ossie_Props/Texture/M_StickBrown.uasset b/SeagullGame/Content/Ossie_Props/Texture/M_StickBrown.uasset new file mode 100644 index 0000000..2f231a8 --- /dev/null +++ b/SeagullGame/Content/Ossie_Props/Texture/M_StickBrown.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fa7cd3a7c20c32f3458d0a252bd718a5ff906a6dfa96a47301917592a75e5fa +size 7687 diff --git a/SeagullGame/Content/Ossie_Props/Texture/M_WetFloor.uasset b/SeagullGame/Content/Ossie_Props/Texture/M_WetFloor.uasset new file mode 100644 index 0000000..de5312c --- /dev/null +++ b/SeagullGame/Content/Ossie_Props/Texture/M_WetFloor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:772df88aeebd3a76e716f66ff89c8e96876ce417c25199ac9d2176110916865a +size 12462 diff --git a/SeagullGame/Content/Ossie_Props/Texture/WetFloor_M_WetFloor_BaseColor.uasset b/SeagullGame/Content/Ossie_Props/Texture/WetFloor_M_WetFloor_BaseColor.uasset new file mode 100644 index 0000000..c590c28 --- /dev/null +++ b/SeagullGame/Content/Ossie_Props/Texture/WetFloor_M_WetFloor_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93cd9a51030b326ce063cd2b52b275254c975e2e99665fcaac668efb11d8d1f2 +size 28160 diff --git a/SeagullGame/Content/Ossie_Props/Texture/WetFloor_M_WetFloor_OcclusionRoughnessMetallic.uasset b/SeagullGame/Content/Ossie_Props/Texture/WetFloor_M_WetFloor_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..ebef2d9 --- /dev/null +++ b/SeagullGame/Content/Ossie_Props/Texture/WetFloor_M_WetFloor_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e197234c0d4e8c4a9f12f58d98b8b23c28113f8008ce56f303f7dd13d8bcefa6 +size 19127 diff --git a/SeagullGame/Content/Ossie_Props/WetFloor.uasset b/SeagullGame/Content/Ossie_Props/WetFloor.uasset index a921faf..ea21575 100644 --- a/SeagullGame/Content/Ossie_Props/WetFloor.uasset +++ b/SeagullGame/Content/Ossie_Props/WetFloor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f388bcb983fe499ea7cfcc26842da4e8a0ba3104a5bb0dc6851f3ba042bee49 -size 26158 +oid sha256:5f3e29ef678fb0f37377733282985bcf7e2dbdc536346c0b479498c14e5136ac +size 26164 diff --git a/SeagullGame/Content/Ossie_Props/WetFloor_M_WetFloor_BaseColor.uasset b/SeagullGame/Content/Ossie_Props/WetFloor_M_WetFloor_BaseColor.uasset deleted file mode 100644 index 2a2eab2..0000000 --- a/SeagullGame/Content/Ossie_Props/WetFloor_M_WetFloor_BaseColor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:feb7721f75317e745226bb483184e5ca5e1995a4238f63bb26667734321c0304 -size 28149 diff --git a/SeagullGame/Content/Ossie_Props/WetFloor_M_WetFloor_OcclusionRoughnessMetallic.uasset b/SeagullGame/Content/Ossie_Props/WetFloor_M_WetFloor_OcclusionRoughnessMetallic.uasset deleted file mode 100644 index 8bd3664..0000000 --- a/SeagullGame/Content/Ossie_Props/WetFloor_M_WetFloor_OcclusionRoughnessMetallic.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc7be8ef41e163d3b4fa6159cee351ecd522f4a96b7f5907f3eb37f02c3e0229 -size 19116 diff --git a/SeagullGame/Content/UI/BP_HUD.uasset b/SeagullGame/Content/UI/BP_HUD.uasset index daf9a36..3a4c0f3 100644 --- a/SeagullGame/Content/UI/BP_HUD.uasset +++ b/SeagullGame/Content/UI/BP_HUD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28f086f73dcc201a97f42490bc8b431fdd0ff0d6d9bc6824221930bd2724db9c -size 140002 +oid sha256:58415508a9fcfa4635c7a3c3f70b9ce83548c6e1511cbe5fc5553d93a5df07f4 +size 202132 diff --git a/SeagullGame/Source/SeagullGame/SeagullGameCharacter.cpp b/SeagullGame/Source/SeagullGame/SeagullGameCharacter.cpp index 14f76f5..cf4ed42 100644 --- a/SeagullGame/Source/SeagullGame/SeagullGameCharacter.cpp +++ b/SeagullGame/Source/SeagullGame/SeagullGameCharacter.cpp @@ -155,6 +155,17 @@ void ASeagullGameCharacter::StartGame() UStaticMeshComponent* MeshComponent = Cast(John->GetComponentByClass(UStaticMeshComponent::StaticClass())); if (!MeshComponent->HasAnySockets()) return; CravingItemActor->AttachToComponent(MeshComponent, FAttachmentTransformRules::SnapToTargetNotIncludingScale, "CravingSocket"); + FString CravingString = UEnum::GetValueAsString(CurrentCraving); + CravingString.Split(FString("::"), nullptr, &CravingString); + for (int i = 0; i < CravingString.Len(); i++) + { + if (CravingString[i] >= 'A' && CravingString[i] <= 'Z') + { + CravingString.InsertAt(i, " "); + i++; + } + } + CravingItemName = CravingString; }, 60, true, 2); } @@ -208,6 +219,17 @@ void ASeagullGameCharacter::PickupItem() CurrentItem->AttachToComponent(MeshComponent, FAttachmentTransformRules::SnapToTargetNotIncludingScale, "ItemSocket"); CurrentItem->SetActorEnableCollision(false); ClosestItemActor->Destroy(); + FString HeldItemString = UEnum::GetValueAsString(Cast(CurrentItem)->ItemType); + HeldItemString.Split(FString("::"), nullptr, &HeldItemString); + for (int i = 0; i < HeldItemString.Len(); i++) + { + if (HeldItemString[i] >= 'A' && HeldItemString[i] <= 'Z') + { + HeldItemString.InsertAt(i, " "); + i++; + } + } + HeldItemName = HeldItemString; } void ASeagullGameCharacter::DropItem() @@ -221,6 +243,7 @@ void ASeagullGameCharacter::DropItem() GetWorld()->SpawnActor(Cast(CurrentItem)->ItemNoPhysics, &DropLocation); CurrentItem->Destroy(); CurrentItem = nullptr; + HeldItemName = ""; } void ASeagullGameCharacter::OnPickupBoxBeginOverlap(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) diff --git a/SeagullGame/Source/SeagullGame/SeagullGameCharacter.h b/SeagullGame/Source/SeagullGame/SeagullGameCharacter.h index d8bcb3f..c15fb90 100644 --- a/SeagullGame/Source/SeagullGame/SeagullGameCharacter.h +++ b/SeagullGame/Source/SeagullGame/SeagullGameCharacter.h @@ -122,6 +122,10 @@ public: TArray> ItemActors; UPROPERTY(BlueprintReadOnly, Category = "Item") AActor* CravingItemActor; + UPROPERTY(BlueprintReadOnly, Category = "Item") + FString CravingItemName; + UPROPERTY(BlueprintReadOnly, Category = "Item") + FString HeldItemName; UPROPERTY(BlueprintReadOnly, Category = "John") AActor* John;