diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index 270809b..644b10e 100644 --- a/Content/Assets/Characters/Merchant/AMerchant.uasset +++ b/Content/Assets/Characters/Merchant/AMerchant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c2a7a3a7840c1af4218d510e1c2130299598d16f5a728f1e3a0a49fd580a879 -size 154699 +oid sha256:3dbe6bcb0cc18389a3f0c8dea2e57b06f6b221a43a5414eaf6d2abf00fd1cfc9 +size 153697 diff --git a/Content/BlueprintAI/AI/AIBruh_Boss.uasset b/Content/BlueprintAI/AI/AIBruh_Boss.uasset index 3be9d93..6d81571 100644 --- a/Content/BlueprintAI/AI/AIBruh_Boss.uasset +++ b/Content/BlueprintAI/AI/AIBruh_Boss.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:def3f3390079faca86cbe8342b33a46714823cf2b80a2388a275805c700a2eb0 -size 143166 +oid sha256:b76dd11c5e7de7092a12c9f139ae21b21707645cd198c4bd5343f7d2501439d6 +size 143177 diff --git a/Content/Blueprints/Combat_UI/Battle_paper.uasset b/Content/Blueprints/Combat_UI/Battle_paper.uasset new file mode 100644 index 0000000..ad018a2 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Battle_paper.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fc018b2ec71fc167ba92191a7ad2323f226abe6af3b4f6c0df4e803b43914ea +size 745226 diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index ff5d157..43d91cf 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:105d6df7f4c76bb98360aa3eff4f469b822b9181a792c69f9bfc4573701cb31a -size 94121 +oid sha256:44bf29e69412c889033c5106b9624303c2f3a851d6c9e8ec711785d6fb141315 +size 93552 diff --git a/Content/Blueprints/Items/SistersPendant.uasset b/Content/Blueprints/Items/SistersPendant.uasset index eb27f03..e262d28 100644 --- a/Content/Blueprints/Items/SistersPendant.uasset +++ b/Content/Blueprints/Items/SistersPendant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bde379752f541d9c5531b00dc2864e7f52f8957775e4c60542146e2ffff360a4 -size 6888 +oid sha256:85af68fb60cfa21d59127e85ffe1e435a2598e1a3bb3b706f4610c198b37734f +size 6840 diff --git a/Content/Blueprints/Quest_UI/Quest_UI.uasset b/Content/Blueprints/Quest_UI/Quest_UI.uasset index 4402f17..d963e74 100644 --- a/Content/Blueprints/Quest_UI/Quest_UI.uasset +++ b/Content/Blueprints/Quest_UI/Quest_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eff7d76ef619408cc8b3b95782ea54d539a4fdb617ae3e0a38b0e04f3d9bce11 -size 46490 +oid sha256:282e2ac7fd7d005ad5fc112fb12cef0895aca57c3a740c86781ae73c16442e3a +size 46040 diff --git a/Content/Blueprints/Quest_UI/quest_paper.uasset b/Content/Blueprints/Quest_UI/quest_paper.uasset new file mode 100644 index 0000000..641b256 --- /dev/null +++ b/Content/Blueprints/Quest_UI/quest_paper.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55f66da2cac3818cdc3fcd0aab474ae35a8775a02ff742e2d421f920b1fe1551 +size 874683 diff --git a/Content/Blueprints/Quests/Headcut/BossIcon.uasset b/Content/Blueprints/Quests/Headcut/BossIcon.uasset new file mode 100644 index 0000000..259a737 --- /dev/null +++ b/Content/Blueprints/Quests/Headcut/BossIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90cc8f29b350ca2974ae42eca492dbb6f8161036741a4ba7666577c25b25506a +size 3111782 diff --git a/Content/Blueprints/Quests/Headcut/BossIcon2.uasset b/Content/Blueprints/Quests/Headcut/BossIcon2.uasset new file mode 100644 index 0000000..b159a7f --- /dev/null +++ b/Content/Blueprints/Quests/Headcut/BossIcon2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6f7744e92210e69d338d8a5d6dc5aa3631d10a55e711c98adfd3098d288c365 +size 2997447 diff --git a/Content/Blueprints/Quests/Headcut/MerchantIcon.uasset b/Content/Blueprints/Quests/Headcut/MerchantIcon.uasset new file mode 100644 index 0000000..a55d8c0 --- /dev/null +++ b/Content/Blueprints/Quests/Headcut/MerchantIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fc5c83bf4683f300ba0dbc41f2248b4e5f1539cb276e2980e694de686ba65f8 +size 1773174 diff --git a/Content/Blueprints/Quests/Headcut/SisterIcon.uasset b/Content/Blueprints/Quests/Headcut/SisterIcon.uasset new file mode 100644 index 0000000..ce39726 --- /dev/null +++ b/Content/Blueprints/Quests/Headcut/SisterIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b41309915584af9c4c3c0ddc57c4ce994482a01ca4fc9fa44fddec20a63bc400 +size 1846963 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant.uasset b/Content/Blueprints/Quests/Quest_SistersPendant.uasset index 7bc91d3..35a3c03 100644 --- a/Content/Blueprints/Quests/Quest_SistersPendant.uasset +++ b/Content/Blueprints/Quests/Quest_SistersPendant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50ba273939fb143e26b621f996bc0699a4402b1744733af7fca9b3fba6a7952a +oid sha256:5d617efabb691daf8a5007996bed1bb226db5bfb1cf50695ff73422604c52194 size 7366 diff --git a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset index 7345bf8..a500bdc 100644 --- a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset +++ b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5b181ff3dd542e3e1773dd8e3a060dadcf3ce0a49c8e28d9c6fb6eef86399fc +oid sha256:61961e5d9cbbc13e36bbe3db62d9b26626bf71c0a28bb008e17c2380afbdfde0 size 7395 diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset index df21704..c0026c0 100644 --- a/Content/Dialogue/SM_Merchant_Blueprint.uasset +++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9d0bee94712b58cd1bb70fedf013d226a7f6f1cb4d383ceff8fb24210e7a20f -size 144157 +oid sha256:8a7bec9951b82b618fbc983c556342f661ded8d07ce021f63458865b343c236e +size 144185 diff --git a/Content/Images/pendant.uasset b/Content/Images/pendant.uasset new file mode 100644 index 0000000..f0a4993 --- /dev/null +++ b/Content/Images/pendant.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2947413315e7c37248d18c700ce2d9744d01987c63c2c5a62487d2a45aeec23 +size 224001 diff --git a/Content/Images/pendant_bg.uasset b/Content/Images/pendant_bg.uasset new file mode 100644 index 0000000..fc9088d --- /dev/null +++ b/Content/Images/pendant_bg.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7251ae30df85789a5bc7f10bc394c8f4e4bedc9559ee1ef4180b3ffac1959d3b +size 317431 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 0efd646..f3abe08 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e98ba4125a82a9b676d2c5c8494c4cbc4569df261e179c47cd6e49e6cae8f77b -size 4956885 +oid sha256:34153e64e49d3607a0d3ad75acb6dc46e6f1e88cf59fa2c23be1d0c459f66ecb +size 4959204 diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index a13909e..3cd89f3 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -25,7 +25,7 @@ void UInventoryComponent::BeginPlay() Super::BeginPlay(); InventoryNotificationWidgetInstance = CreateWidget(GetWorld(), InventoryNotificationWidgetClass); - InventoryNotificationWidgetInstance->AddToViewport(); + InventoryNotificationWidgetInstance->AddToViewport(20); //activates the AddItem function for every DefaultItem that inherits BaseItem for (auto& BaseItem : DefaultItems)