diff --git a/Content/Assets/Characters/Goat_Enemy/GoatMaterial/GoatMat.uasset b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/GoatMat.uasset new file mode 100644 index 0000000..5cb481a --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/GoatMat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c66bcb5a3e67c53c6c13e010e9a796f02226385eec59fc4254396597171d9428 +size 13791 diff --git a/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_BaseColor.uasset b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_BaseColor.uasset new file mode 100644 index 0000000..9e80521 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1277bed9c3deca24a55fe17e6db113c30e81455b06590dfab10045bdb124baf2 +size 579513 diff --git a/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_Normal.uasset b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_Normal.uasset new file mode 100644 index 0000000..c7bac29 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bc3a9ef0e1f82906980de8ac67387613eb5b5f9057722d114393d5ac47ffa86 +size 2649954 diff --git a/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..ea1fdc6 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af9dcda8647b8de19e090d6f7fb695b57bb3be1916d485af7633c138c7c049f6 +size 1934611 diff --git a/Content/Assets/Characters/Goat_Enemy/SM_Goat.uasset b/Content/Assets/Characters/Goat_Enemy/SM_Goat.uasset new file mode 100644 index 0000000..50c07c3 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/SM_Goat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08cf433cf28399d47861c4961d9d00e8e0e04d0a81943a4e46bf3fcdda053d87 +size 132625 diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset new file mode 100644 index 0000000..f2d9d38 --- /dev/null +++ b/Content/Assets/Characters/Merchant/AMerchant.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1270d07a6c8315f01ecfdf43cbcab5049eee1fd0c00ddc4344ff2f2be017567d +size 31318 diff --git a/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset b/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset new file mode 100644 index 0000000..50efe8c --- /dev/null +++ b/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3135dc7e625d2f8e8aae5488935f1395229cbe0b7e51491ff15d6fe51f792947 +size 14188 diff --git a/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_BaseColor.uasset b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_BaseColor.uasset new file mode 100644 index 0000000..2d06e86 --- /dev/null +++ b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:891342eda1bb812e055801b911b41ca3b5e50ae69739abb5bf1d0be22ff162cf +size 651949 diff --git a/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_Normal.uasset b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_Normal.uasset new file mode 100644 index 0000000..477b4dc --- /dev/null +++ b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04e7431e5e6151021902ea5792677a3539cb09eb6e70e35de63593284663e2bd +size 2730787 diff --git a/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.uasset b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..234732f --- /dev/null +++ b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:647f073a3a44e88435f44d5aa8a5bb68ed172ec8117e367585a9da9a2dd7ad09 +size 2162523 diff --git a/Content/Assets/Characters/Merchant/Merchant_Body_low.uasset b/Content/Assets/Characters/Merchant/Merchant_Body_low.uasset new file mode 100644 index 0000000..7436282 --- /dev/null +++ b/Content/Assets/Characters/Merchant/Merchant_Body_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:331d3f8aa3362dd44df3a9b22fd40da4a37ef652b2a66751e56338a0ceddab5c +size 113906 diff --git a/Content/Assets/Characters/Merchant/Merchant_Boots_low.uasset b/Content/Assets/Characters/Merchant/Merchant_Boots_low.uasset new file mode 100644 index 0000000..f4d4dce --- /dev/null +++ b/Content/Assets/Characters/Merchant/Merchant_Boots_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b7bc76f0737552672007b78b0cbdabb540442de4bbc1f0aa0f7dd798942bb5d +size 64948 diff --git a/Content/Assets/Characters/Merchant/Merchant_Hair_low.uasset b/Content/Assets/Characters/Merchant/Merchant_Hair_low.uasset new file mode 100644 index 0000000..ab2cae9 --- /dev/null +++ b/Content/Assets/Characters/Merchant/Merchant_Hair_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8940934dfabee8c92af63163d4cdc202e2a5c6a38b65ef059b189aa0189833c +size 49013 diff --git a/Content/Assets/Characters/Merchant/Merchant_Hood_low.uasset b/Content/Assets/Characters/Merchant/Merchant_Hood_low.uasset new file mode 100644 index 0000000..1a68223 --- /dev/null +++ b/Content/Assets/Characters/Merchant/Merchant_Hood_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44af7608c28cfe842ca6f531641cdad1306e1e80a90da5a29c03289dd47c96e6 +size 51518 diff --git a/Content/Assets/Characters/Merchant/Merchant_Sash_low.uasset b/Content/Assets/Characters/Merchant/Merchant_Sash_low.uasset new file mode 100644 index 0000000..fc840ea --- /dev/null +++ b/Content/Assets/Characters/Merchant/Merchant_Sash_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e1222cf7143c3a98e8d8a268bc9686717b8305d26b8425559cf7be231861aa8 +size 30865 diff --git a/Content/Assets/Characters/Merchant/Merchant_Sleeves_low.uasset b/Content/Assets/Characters/Merchant/Merchant_Sleeves_low.uasset new file mode 100644 index 0000000..6e08324 --- /dev/null +++ b/Content/Assets/Characters/Merchant/Merchant_Sleeves_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cffcdda3cf0df123db554cbfa13bed0a6e03d94d3a19f26307a82e449f9682ea +size 52789 diff --git a/Content/Assets/Characters/Merchant/SM_Merchant.uasset b/Content/Assets/Characters/Merchant/SM_Merchant.uasset new file mode 100644 index 0000000..424f705 --- /dev/null +++ b/Content/Assets/Characters/Merchant/SM_Merchant.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1268883cc301435c4f591d01ae206fda567a09573b86398ebaa87cfd64ce8c1c +size 226422 diff --git a/Content/Assets/Objects/Crystal/Crystal_texture.uasset b/Content/Assets/Objects/Crystal/Crystal_texture.uasset index c48436b..8f1cac6 100644 --- a/Content/Assets/Objects/Crystal/Crystal_texture.uasset +++ b/Content/Assets/Objects/Crystal/Crystal_texture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f907311301f33af5e826d7527af5fe824ca31af652973e92194e731817bb641c -size 9450 +oid sha256:a27fea9563381f5a89d5e658b18507b745735b8c9b2266600d441472797eba02 +size 9506 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset new file mode 100644 index 0000000..44df2d8 --- /dev/null +++ b/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10c9dc771f21d3c53189e495b50e14dc085ec19747eb9ac94b7c333c95984e6c +size 19617 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset new file mode 100644 index 0000000..73a42bd --- /dev/null +++ b/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12d7a594328c6ff503bb84394e0231763e43e16bce860c1cdd2693d1d803688d +size 19602 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset new file mode 100644 index 0000000..c62c333 --- /dev/null +++ b/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d13be982df3d62ec7e21a47564954f081b3fc9c6d10f35895106f3c33913baa7 +size 19700 diff --git a/Content/Assets/Objects/Crystal/crystal_1.uasset b/Content/Assets/Objects/Crystal/crystal_1.uasset new file mode 100644 index 0000000..c132ee5 --- /dev/null +++ b/Content/Assets/Objects/Crystal/crystal_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc9138d1b2aa0945e176a7906f652546d469e943bfa14ce70b737aca8a2609ca +size 21074 diff --git a/Content/Assets/Objects/Crystal/crystal_2.uasset b/Content/Assets/Objects/Crystal/crystal_2.uasset new file mode 100644 index 0000000..c041dfe --- /dev/null +++ b/Content/Assets/Objects/Crystal/crystal_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d4702e4920c0fc3c32388f9befe28d44f0b592e5330c7a3cbf8af8450d944b0 +size 19797 diff --git a/Content/Assets/Objects/Crystal/crystal_3.uasset b/Content/Assets/Objects/Crystal/crystal_3.uasset new file mode 100644 index 0000000..abe236d --- /dev/null +++ b/Content/Assets/Objects/Crystal/crystal_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f89927cfc267c514b9c03e39844592830505301d93497ae81db87fc0e003d91d +size 19977 diff --git a/Content/Assets/Objects/Crystal/lambert1.uasset b/Content/Assets/Objects/Crystal/lambert1.uasset new file mode 100644 index 0000000..29a1ca2 --- /dev/null +++ b/Content/Assets/Objects/Crystal/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ff0470f6c54509751322e1e9e737238037becd5f918f5640cc743e19276f744 +size 8048 diff --git a/Content/Assets/Objects/General_Dressing/Barrel.uasset b/Content/Assets/Objects/General_Dressing/Barrel.uasset new file mode 100644 index 0000000..dd9faca --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Barrel.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a946b4605d42bad30b31156db3f18d870ec7f76662f5b4585639fd8a86954924 +size 57598 diff --git a/Content/Assets/Objects/General_Dressing/Beams_1.uasset b/Content/Assets/Objects/General_Dressing/Beams_1.uasset new file mode 100644 index 0000000..1824e50 --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Beams_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2b045d81d6b3e5e0b32bdf94e29871661bb17d55137db0b241ffc41f9a949bd +size 20977 diff --git a/Content/Assets/Objects/General_Dressing/Beams_2.uasset b/Content/Assets/Objects/General_Dressing/Beams_2.uasset new file mode 100644 index 0000000..a482ae8 --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Beams_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05f0ca1e948c78fbc2403e61a047f5b5edca8b13626e4e1e4a53439e7f766b76 +size 19877 diff --git a/Content/Assets/Objects/General_Dressing/Chest.uasset b/Content/Assets/Objects/General_Dressing/Chest.uasset new file mode 100644 index 0000000..c17c5c0 --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Chest.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c6a0ba4df84407e360c283e2ee837910e102b83000de6f209b702a23eb468f3 +size 44108 diff --git a/Content/Assets/Objects/General_Dressing/Large_Crate.uasset b/Content/Assets/Objects/General_Dressing/Large_Crate.uasset new file mode 100644 index 0000000..0b78ed6 --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Large_Crate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2901336e34428ffce2648c4d13adbc0b475b29ea0e2da1c9c03e244ce2b1db16 +size 22360 diff --git a/Content/Assets/Objects/General_Dressing/Pickaxe.uasset b/Content/Assets/Objects/General_Dressing/Pickaxe.uasset new file mode 100644 index 0000000..b2f4ba5 --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Pickaxe.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40a0bbe5a1d3fd464683cb94adae45af94720bd27d5a16f315d9161444bfc017 +size 42744 diff --git a/Content/Assets/Objects/General_Dressing/Plank_Long.uasset b/Content/Assets/Objects/General_Dressing/Plank_Long.uasset new file mode 100644 index 0000000..d5cdb18 --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Plank_Long.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a78edbea47344e5ed8f63b661f20778a5508e2a25560f9bd55a547886daf87a1 +size 23468 diff --git a/Content/Assets/Objects/General_Dressing/Plank_Short.uasset b/Content/Assets/Objects/General_Dressing/Plank_Short.uasset new file mode 100644 index 0000000..77c009a --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Plank_Short.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1b0020da5181f43b622b2095407e47261d4b609ab6aaab47e543c9e54b21ff1 +size 22698 diff --git a/Content/Assets/Objects/General_Dressing/Sign_Short.uasset b/Content/Assets/Objects/General_Dressing/Sign_Short.uasset new file mode 100644 index 0000000..317a00c --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Sign_Short.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6d6227149193290826d3d402c9a09bbf0a270eaeca3e6fe17af42c99100c712 +size 23174 diff --git a/Content/Assets/Objects/General_Dressing/Sign_Tall.uasset b/Content/Assets/Objects/General_Dressing/Sign_Tall.uasset new file mode 100644 index 0000000..709c9cf --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Sign_Tall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:faaf0c8413c90b3f1afd5a5e63663db0711b86a77930cec006e6703e852424a7 +size 24112 diff --git a/Content/Assets/Objects/General_Dressing/Small_Crate.uasset b/Content/Assets/Objects/General_Dressing/Small_Crate.uasset new file mode 100644 index 0000000..a2a6514 --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/Small_Crate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1d9c12f77638933d3a372a3bed5137b78badf94a2b1c98cbbe1834a871d1b62 +size 24837 diff --git a/Content/Assets/Objects/General_Dressing/lambert1.uasset b/Content/Assets/Objects/General_Dressing/lambert1.uasset new file mode 100644 index 0000000..e4112d5 --- /dev/null +++ b/Content/Assets/Objects/General_Dressing/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3021d9aecf7da4d51d2f87c1d042fd03e9d3ed56d2612d218835e0f8ce07cc32 +size 8066 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset new file mode 100644 index 0000000..718d3a5 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f6b2b37720adf408908f5e4fa9d0e7fdb374b163de8324d83be0cb52991145d +size 51796 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset new file mode 100644 index 0000000..1daf1d8 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa5a61732a2262b353644b769430c9761ff82e9ed5ca8d630d355d94125a8953 +size 27141 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset new file mode 100644 index 0000000..4c5ec29 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0344078b2321f8137df168613de73d0943fb6cc8c3d51a7a484e4df12af4a610 +size 48935 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset new file mode 100644 index 0000000..da8ae10 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c96de59b0974abd801a7315d2dfc4a0240e886955546dd8a858c1726a02217d +size 23022 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset new file mode 100644 index 0000000..169bdc0 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d214c2da928f053645485cadef58b3a34b0086b29e9c47e91b4b3e855dd3e1 +size 40380 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset new file mode 100644 index 0000000..f3c8510 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c428d180528478633c6abab151b4f0211187db3a8961feb97778f46168375e3 +size 215935 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset new file mode 100644 index 0000000..8787c52 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:303b4b55e1dea3dec3467908f7fd6c2c626b2bfba89810fd9c22f866dd4562dd +size 41587 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset new file mode 100644 index 0000000..a9c092e --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c93bb951d8ec9914e8438c3a2cceb691c8cdde82038fb862f80b3aade2a2583 +size 50006 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset new file mode 100644 index 0000000..e28271c --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:225592daa7a25679d240c6cc04766fa370d454cb0f7488e0a5913e2421b848a4 +size 60277 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset new file mode 100644 index 0000000..c69abf1 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d80697161fe1cb09332c9e8d755ec4bed77e9d369820a4a0ada587635077f885 +size 42056 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset new file mode 100644 index 0000000..8f8a1f7 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd6f424d1ccc32a61f85632dc9af580f32f8d137f8fb31a6e253a5e72823a102 +size 56639 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel_low.uasset new file mode 100644 index 0000000..ec9f95a --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b74f62c7fc55c0d4a2e1d6a5d5c3c9bca31902de5be14de755d7edb86f96a82 +size 56439 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset new file mode 100644 index 0000000..dfd2497 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16346f6da3c30cdbe153ef3504040df11bb90ae9327900b545457581d166ddfc +size 19502 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_bucket_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_bucket_low.uasset new file mode 100644 index 0000000..9a0ac20 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_bucket_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3f5e472045c6eabe68b8725bc8a5a9c7735232b7490b570c0933f992e7dff13 +size 43551 diff --git a/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset b/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset new file mode 100644 index 0000000..8e1b579 --- /dev/null +++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d45e30bfa9282e263786243bb7b1839e2168f5d6079569b86612b833bcccc4cf +size 62792 diff --git a/Content/BlueprintAI/AI/AIBruh.uasset b/Content/BlueprintAI/AI/AIBruh.uasset index a1d3bbf..61db4c0 100644 --- a/Content/BlueprintAI/AI/AIBruh.uasset +++ b/Content/BlueprintAI/AI/AIBruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a815378a5966a1dc2c90b4ea05efd6e1dc4cf6e70c345ffaf4ee95476279102 -size 83102 +oid sha256:4039b2a8b17f4bece82f9276c877388fb25888ac4651a2dae9541d517ceed6d9 +size 80454 diff --git a/Content/Blueprints/Items/AmmoItem.uasset b/Content/Blueprints/Items/AmmoItem.uasset index 9991ade..e229918 100644 --- a/Content/Blueprints/Items/AmmoItem.uasset +++ b/Content/Blueprints/Items/AmmoItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d7e4e608a5183142630757d1496d08c76ac9cdcb16b039c3b2e51848ab89d9d -size 6552 +oid sha256:ae9de1eab287b804575b3929065215a0798cc3371c128b849c2b79e6bb8f0c88 +size 2435 diff --git a/Content/Blueprints/Items/BP_Azos.uasset b/Content/Blueprints/Items/BP_Azos.uasset new file mode 100644 index 0000000..d6b8604 --- /dev/null +++ b/Content/Blueprints/Items/BP_Azos.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:234c3634a776d904e4b0641b0f1252ae5fcf7cd7c427467793bf8aded7f28a28 +size 6089 diff --git a/Content/Blueprints/Items/BP_Eis.uasset b/Content/Blueprints/Items/BP_Eis.uasset new file mode 100644 index 0000000..d504056 --- /dev/null +++ b/Content/Blueprints/Items/BP_Eis.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e2bde130e60fb78f77bccd26a57a0bb6e4cba83b788cb331720b202dc6f9b54 +size 6083 diff --git a/Content/Blueprints/Items/BP_Iroquoid.uasset b/Content/Blueprints/Items/BP_Iroquoid.uasset new file mode 100644 index 0000000..422470d --- /dev/null +++ b/Content/Blueprints/Items/BP_Iroquoid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:746d9a0978283b0776f92252768a7e50e883a80552c05265e3545778171826c2 +size 6148 diff --git a/Content/Blueprints/Items/BP_Probertium.uasset b/Content/Blueprints/Items/BP_Probertium.uasset new file mode 100644 index 0000000..9bacdf5 --- /dev/null +++ b/Content/Blueprints/Items/BP_Probertium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f05fac1edb1f8eb1183644863c27eebf70582a7bcfa28f9d3db744dca17f8c12 +size 6193 diff --git a/Content/Blueprints/Items/ItemMaterials/Mat_Azos.uasset b/Content/Blueprints/Items/ItemMaterials/Mat_Azos.uasset new file mode 100644 index 0000000..78a2c43 --- /dev/null +++ b/Content/Blueprints/Items/ItemMaterials/Mat_Azos.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:566ff5af0b53291e07b75582fd505b28a6ff9d40324300c052bd132375f0a590 +size 8539 diff --git a/Content/Blueprints/Items/ItemMaterials/Mat_Eis.uasset b/Content/Blueprints/Items/ItemMaterials/Mat_Eis.uasset new file mode 100644 index 0000000..6d29e9c --- /dev/null +++ b/Content/Blueprints/Items/ItemMaterials/Mat_Eis.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5082614d2de6faba8413c5133f7ab0f0c33879f694c5964a1144990d57240d2e +size 8068 diff --git a/Content/Blueprints/Items/ItemMaterials/Mat_Iroquoid.uasset b/Content/Blueprints/Items/ItemMaterials/Mat_Iroquoid.uasset new file mode 100644 index 0000000..a3fcb0e --- /dev/null +++ b/Content/Blueprints/Items/ItemMaterials/Mat_Iroquoid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ce220cd5bbfd15c45ef492e4224c77425ff5fdae2c871dcaeabb0faa7d83dbc +size 9049 diff --git a/Content/Blueprints/Items/ItemMaterials/Mat_Probertium.uasset b/Content/Blueprints/Items/ItemMaterials/Mat_Probertium.uasset new file mode 100644 index 0000000..33a9312 --- /dev/null +++ b/Content/Blueprints/Items/ItemMaterials/Mat_Probertium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:269ed5dd67e1df195b85ed258666102e679e410bf87b5e3b390286784f0ffbf4 +size 8504 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset index fa2720b..acc425f 100644 --- a/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset +++ b/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:733e8e625dc0b5a4b8e64f50ccda5397cdeb71aa75470f42b44a4c2606730875 -size 31844 +oid sha256:3d4ed8e2f2bd04442adeb681bb66a9291643bb736ec18bbd24f817dc9bf150ee +size 2559 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_Azos.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_Azos.uasset new file mode 100644 index 0000000..b258efa --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_Azos.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bbd54a7ea6d9bb800d06bf1534e9c2c34d573df79b09621984714de201fa9f7 +size 32219 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_Eis.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_Eis.uasset new file mode 100644 index 0000000..2c22049 --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_Eis.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40b1b3aba3e44f2ae79359b14e31f68e79ca1dd18de2737374f36c4c6d9711b4 +size 31932 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset index b53dd84..069d7c8 100644 --- a/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset +++ b/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14abf326c7821612e3c60b5312759ae40948cadf47a909bf25201e0dfa39ea7d -size 31322 +oid sha256:207d52857de00655fb62c13a3d54b5661b6183a9fcdd04d5b46a19784b8cc8eb +size 29386 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_Iroquoid.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_Iroquoid.uasset new file mode 100644 index 0000000..38cdd02 --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_Iroquoid.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8978cc1273cc732a6c994b47f40eec7facd06989723ee169bca4f3be98a9aeed +size 32668 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_Probertium.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_Probertium.uasset new file mode 100644 index 0000000..a83b723 --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_Probertium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0134465b90f3930c3f007072f3d6f10aec678577f2d00ed32858d0d3aa0b3f5e +size 32046 diff --git a/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset b/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset index b339768..0ae68a6 100644 --- a/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset +++ b/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93c2579a50581de90958bd63c90f5844eed16729abeba05616fac1d57f10c0a5 -size 27054 +oid sha256:98d47c1eb2de2e722874ccbe60cf36670782ace49131c495b8f8b7e22affc293 +size 27997 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 2df15ce..c1c2314 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86f2355238fc96028acb3309b9984e9640cd82252b064f8610435373e86a4a2b -size 109345 +oid sha256:ea3609b06714aab8fd0cf5ca10e2c4379e5358e44218635bdc387c092fd6b392 +size 69898 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index ddc5b00..4e5ee4c 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:efe6873fdfa3179afbd11ac1d6f5d8b101610fa924f6b72c8e9212f730ac0c9f -size 413107 +oid sha256:849801a3b9c19ba6b522a5be233f4d88a0040f54c1f843a0cf724597f198c1ca +size 555713 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index e1f4942..ebc46dd 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5cc473e60c24da835baacec54217c1f6c675c42c29643b889f07bff057a9c95 -size 34830 +oid sha256:2d21e5c1b55bc786f7f2acecf0140952e360e56c51adc58ce6ae442c38d9023e +size 41066 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index 5d4fbf7..c48f748 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:829f22622e756a22f1479702b28b01b3d836dbba7629ecd1614ba916ea6f513f -size 245091 +oid sha256:c0a29be4cf2240bc85bd3868e8914ab03d30ab0eed0231d753c4c47e36fa8472 +size 245275 diff --git a/Environment/MerchantShopAssets/MerchantShop.mb b/Environment/MerchantShopAssets/MerchantShop.mb new file mode 100644 index 0000000..5b7c760 --- /dev/null +++ b/Environment/MerchantShopAssets/MerchantShop.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ebde6dacbbcbbeda17b21667600788774f47b11ed110860f560dc4822586e4e +size 14014116 diff --git a/Environment/MerchantShopAssets/MerchantShopBlockout.fbx b/Environment/MerchantShopAssets/MerchantShopBlockout.fbx new file mode 100644 index 0000000..1ae843a --- /dev/null +++ b/Environment/MerchantShopAssets/MerchantShopBlockout.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b5f7048a382aa7e271eceb5e9b133e5b2068dcf3f99fe3c047afe2c06c1aa14 +size 1280320 diff --git a/Environment/MerchantShopAssets/MerchantShop_high.fbx b/Environment/MerchantShopAssets/MerchantShop_high.fbx new file mode 100644 index 0000000..e7c53da --- /dev/null +++ b/Environment/MerchantShopAssets/MerchantShop_high.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c50619eb05b05adc21483680da57d41469a5bf7451c7d2ba3732eb0762a5de69 +size 766320 diff --git a/Environment/MerchantShopAssets/MerchantShop_low.fbx b/Environment/MerchantShopAssets/MerchantShop_low.fbx new file mode 100644 index 0000000..b435b0e --- /dev/null +++ b/Environment/MerchantShopAssets/MerchantShop_low.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b61f428419d8d5f989a4c1f5dd188005bd45871d7d613081b640fac8d9c29f20 +size 372064 diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 613c763..5072b7b 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -54,7 +54,16 @@ public: bool isDamageBuffItem; UPROPERTY(EditAnywhere, Category = "Item") - bool isAmmoItemType; + bool isProbertiumType; + + UPROPERTY(EditAnywhere, Category = "Item") + bool isEisType; + + UPROPERTY(EditAnywhere, Category = "Item") + bool isAzosType; + + UPROPERTY(EditAnywhere, Category = "Item") + bool isIroquoidType; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") int32 StackCount = 1; diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index 0d0098d..dab9f6d 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -39,18 +39,48 @@ void UEatableItems::Use(ATempCharacter* Character) Character->Inventory->RemoveItem(this); } - if (isAmmoItemType) + if (isProbertiumType) { TurnBaseCombat = GetWorld()->GetGameState(); - if (TurnBaseCombat->ProbertiumResource > 10) + if (TurnBaseCombat->ProbertiumResource < 10) { + UE_LOG(LogTemp, Warning, TEXT("Probertium eaten")); TurnBaseCombat->ProbertiumResource += 5; + Character->Inventory->RemoveItem(this); } - if (TurnBaseCombat->EisResource > 10) + } + + if (isEisType) + { + TurnBaseCombat = GetWorld()->GetGameState(); + if (TurnBaseCombat->EisResource < 10) { + UE_LOG(LogTemp, Warning, TEXT("Eis eaten")); TurnBaseCombat->EisResource += 5; + Character->Inventory->RemoveItem(this); + } + } + + if (isAzosType) + { + TurnBaseCombat = GetWorld()->GetGameState(); + if (TurnBaseCombat->AzosResource < 10) + { + UE_LOG(LogTemp, Warning, TEXT("Azos eaten")); + TurnBaseCombat->AzosResource += 5; + Character->Inventory->RemoveItem(this); + } + } + + if (isIroquoidType) + { + TurnBaseCombat = GetWorld()->GetGameState(); + if (TurnBaseCombat->IroquoidResource < 10) + { + UE_LOG(LogTemp, Warning, TEXT("Iroq eaten")); + TurnBaseCombat->IroquoidResource += 5; + Character->Inventory->RemoveItem(this); } - Character->Inventory->RemoveItem(this); } } } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 30376e3..1358d82 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -39,7 +39,7 @@ void ATempCharacter::BeginPlay() PostProcessVolume = Cast(AllActorsInScene[0]); } Enemy = TEXT("Enemy"); - UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors); + //UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors); Ammo = TEXT("Ammo"); NoiseEmitter = Cast(this->FindComponentByClass(UPawnNoiseEmitterComponent::StaticClass())); } @@ -66,27 +66,27 @@ void ATempCharacter::Sneak() UnCrouch(); isInStealth = false; if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.0f; - for (AActor* Actor : AIActors) - { - USphereComponent* SphereComponent = Actor->FindComponentByClass(); - if (SphereComponent != nullptr) - { - SphereComponent->SetSphereRadius(40.0f); //default value - } - } + //for (AActor* Actor : AIActors) + //{ + // USphereComponent* SphereComponent = Actor->FindComponentByClass(); + // if (IsValid(SphereComponent)) + // { + // SphereComponent->SetSphereRadius(40.0f); //default value + // } + //} } else { Crouch(); isInStealth = true; - for (AActor* Actor : AIActors) + /*for (AActor* Actor : AIActors) { USphereComponent* SphereComponent = Actor->FindComponentByClass(); if (IsValid(SphereComponent)) { SphereComponent->SetSphereRadius(5.0f); } - } + }*/ if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.8f; } } diff --git a/readme.md b/readme.md index 4d3effd..b91c0a1 100644 --- a/readme.md +++ b/readme.md @@ -2,6 +2,10 @@ ## By Team 2:13 +### Trello + +https://trello.com/b/umw6SXsi/world-213 + ### Character Dialogue https://docs.google.com/spreadsheets/d/13iVCQuveBiaihpREnY145OZi5QT-1sseNoI0A5v8D1o/edit?usp=sharing