From b1d6bdee0eab6df56412a078a0fa2037b3205bfa Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Thu, 28 Nov 2024 17:36:05 +0000 Subject: [PATCH 1/6] Added in 3 quests into the quest data table Added in the 2 main quests and one side quest i designed for the prototype into the table and are ready to be added into the game itself --- Content/Levels/PrototypeLevel.umap | 4 ++-- Content/QuestSystem/QuestData.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Levels/PrototypeLevel.umap b/Content/Levels/PrototypeLevel.umap index afdbafa..68a0c58 100644 --- a/Content/Levels/PrototypeLevel.umap +++ b/Content/Levels/PrototypeLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4b0bbccc93c7c9477ce0ee763cfbc7f8abcf21aa2162efddac2634690d089b2 -size 8485636 +oid sha256:eb8c4739a1cde72a4210dbf337e6a0351a944a61d51f45995ee59ed1ccd5dc7c +size 8484800 diff --git a/Content/QuestSystem/QuestData.uasset b/Content/QuestSystem/QuestData.uasset index 661dd4e..426512c 100644 --- a/Content/QuestSystem/QuestData.uasset +++ b/Content/QuestSystem/QuestData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d856e4ab5d9267903f42a14fde1e6394e93ce81fa300c84d868a33f69dd492a2 -size 13930 +oid sha256:68fe6811627192f014a151643aca8ebf502db26a99d6d5073a71c532dcdf19e9 +size 32353 From 59768da7698100582caef694c9b2f39ac8d02470 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Sun, 1 Dec 2024 17:16:47 +0000 Subject: [PATCH 2/6] Added spawn area in a forest --- Content/Levels/PrototypeLevelRework.umap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Content/Levels/PrototypeLevelRework.umap diff --git a/Content/Levels/PrototypeLevelRework.umap b/Content/Levels/PrototypeLevelRework.umap new file mode 100644 index 0000000..0eafa01 --- /dev/null +++ b/Content/Levels/PrototypeLevelRework.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05f59234dda0e2da1f7c039177c169cb257c1dbd885077eb146ce706e5917ce6 +size 9050157 From 987e68fec9e1defc6613887cc928248ab7f8250a Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Mon, 2 Dec 2024 10:33:50 +0000 Subject: [PATCH 3/6] Changed all buildings in prototype level rework to chaos destruction assets --- Content/Assets/ChaosAssets/AnchorField.uasset | 3 +++ Content/Assets/ChaosAssets/LargeBuildingCombined.uasset | 4 ++-- Content/Assets/ChaosAssets/MediumBuildingCombined.uasset | 3 +++ Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset | 3 +++ Content/Levels/PrototypeLevelRework.umap | 4 ++-- 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 Content/Assets/ChaosAssets/AnchorField.uasset create mode 100644 Content/Assets/ChaosAssets/MediumBuildingCombined.uasset create mode 100644 Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset diff --git a/Content/Assets/ChaosAssets/AnchorField.uasset b/Content/Assets/ChaosAssets/AnchorField.uasset new file mode 100644 index 0000000..e5b4e40 --- /dev/null +++ b/Content/Assets/ChaosAssets/AnchorField.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b63848f7a0245ef6b4518e2826f1031cec4321bda22429a7f1d986c71078fb0 +size 29793 diff --git a/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset b/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset index 672d99a..af75f98 100644 --- a/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset +++ b/Content/Assets/ChaosAssets/LargeBuildingCombined.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f9da88d42ad759ed282543996694dd1305e24bcdf429cb90d2113e14de4e120 -size 36331718 +oid sha256:7866e3d285ec1070a1fd5bd2f23a53e17feb1840f78fe4097b926e55bd4f7dc0 +size 36331862 diff --git a/Content/Assets/ChaosAssets/MediumBuildingCombined.uasset b/Content/Assets/ChaosAssets/MediumBuildingCombined.uasset new file mode 100644 index 0000000..f0a7f52 --- /dev/null +++ b/Content/Assets/ChaosAssets/MediumBuildingCombined.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c5517fd6bcc0ab00d00492c3335821eb2b19d9ca020b0bd0260373965584c36 +size 3267836 diff --git a/Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset b/Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset new file mode 100644 index 0000000..7036277 --- /dev/null +++ b/Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:292f8c8223a48fdc43b525ef97f3bd6a0b8f78e5e13c00c6a36d2e86645e3e1e +size 3394039 diff --git a/Content/Levels/PrototypeLevelRework.umap b/Content/Levels/PrototypeLevelRework.umap index 0eafa01..1e26c81 100644 --- a/Content/Levels/PrototypeLevelRework.umap +++ b/Content/Levels/PrototypeLevelRework.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05f59234dda0e2da1f7c039177c169cb257c1dbd885077eb146ce706e5917ce6 -size 9050157 +oid sha256:21d37d4963354d01a3171613a0971dd0f4142b53815ed69b36a3199ba297748b +size 2720016 From 4548c189287bff37733976d7c95e15bc53d9ad08 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Mon, 2 Dec 2024 18:59:02 +0000 Subject: [PATCH 4/6] changed something --- Content/Levels/PrototypeLevelRework.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/PrototypeLevelRework.umap b/Content/Levels/PrototypeLevelRework.umap index 1e26c81..2e1c928 100644 --- a/Content/Levels/PrototypeLevelRework.umap +++ b/Content/Levels/PrototypeLevelRework.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21d37d4963354d01a3171613a0971dd0f4142b53815ed69b36a3199ba297748b -size 2720016 +oid sha256:9b663c290ead16b09c53384274983c728cd74f773dd8631462429bdb306958b1 +size 2720743 From 4a69b5e40f240ad4e0dfe03d7fd7638a4922f5e7 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Wed, 4 Dec 2024 12:04:01 +0000 Subject: [PATCH 5/6] Bump Unreal version to 5.5 on this branch --- Monolith.uproject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monolith.uproject b/Monolith.uproject index 5dbac3b..90b8db5 100644 --- a/Monolith.uproject +++ b/Monolith.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.4", + "EngineAssociation": "5.5", "Category": "", "Description": "", "Modules": [ From 2298912e66389cc7c4305b60bc9ecdfccaac8c44 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Wed, 4 Dec 2024 12:46:29 +0000 Subject: [PATCH 6/6] Finished ability 1 I finished the ability one by giving the ability knockback, allowing for the large enemy hit by the attack to get thrown back away. I added in a print string into flats monster to check if the apply damage was working --- Content/Enemies/Flats/BP_FlatsMonster.uasset | 4 ++-- Content/Monolith/BPI_Monolith.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Enemies/Flats/BP_FlatsMonster.uasset b/Content/Enemies/Flats/BP_FlatsMonster.uasset index 27fcb9b..9244dfd 100644 --- a/Content/Enemies/Flats/BP_FlatsMonster.uasset +++ b/Content/Enemies/Flats/BP_FlatsMonster.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8612d68766b341360e175a670d1f6fff0ec8a6744eda9cc9d731d241f1be5fd8 -size 33166 +oid sha256:f2490a32f128d922eeccd2de310b85940d1f2768d8af0387cbdebd43f57d7bdb +size 45403 diff --git a/Content/Monolith/BPI_Monolith.uasset b/Content/Monolith/BPI_Monolith.uasset index 033fb42..7e1003d 100644 --- a/Content/Monolith/BPI_Monolith.uasset +++ b/Content/Monolith/BPI_Monolith.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1f10027f316544b29f22842ba6541bad93635d10665710bb8fca400c5506906 -size 424922 +oid sha256:c654470faf96019a2a09460ab7e8108bca9f2e52d525a67397ec4ecde7af0c54 +size 437368