diff --git a/.vsconfig b/.vsconfig index b9be525..cf3175a 100644 --- a/.vsconfig +++ b/.vsconfig @@ -1,15 +1,10 @@ { "version": "1.0", "components": [ - "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.Windows10SDK", "Microsoft.VisualStudio.Workload.CoreEditor", - "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Workload.NativeCrossPlat", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NativeGame", "Microsoft.VisualStudio.Workload.Universal" diff --git a/Art Misc/Kit1.mb b/Art Misc/Kit1.mb new file mode 100644 index 0000000..eca3777 --- /dev/null +++ b/Art Misc/Kit1.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57f2f86b4123e0fbce94991353b5b862797c0e11c532b881e625a4f5e4c05e3b +size 20360220 diff --git a/Characters/Merchant.fbx b/Characters/Merchant.fbx new file mode 100644 index 0000000..e0eed40 --- /dev/null +++ b/Characters/Merchant.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32fcd3404a48e84cadf20b5db9969bbc9f652573eb2a943ba25900d1515b2a07 +size 348064 diff --git a/Characters/Merchant_low_MerchantMat_BaseColor.png b/Characters/Merchant_low_MerchantMat_BaseColor.png new file mode 100644 index 0000000..9772fd1 --- /dev/null +++ b/Characters/Merchant_low_MerchantMat_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a03401f9644430344fce3047cfce057f08717a356cc5f62e4695b179442ceeee +size 612188 diff --git a/Characters/Merchant_low_MerchantMat_Emissive.png b/Characters/Merchant_low_MerchantMat_Emissive.png new file mode 100644 index 0000000..75a4bfa --- /dev/null +++ b/Characters/Merchant_low_MerchantMat_Emissive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:766ed13d904fbae3073b78eb5acc7f332e174b1ffc207daf1b4ba6b22385c3fd +size 12332 diff --git a/Characters/Merchant_low_MerchantMat_Normal.png b/Characters/Merchant_low_MerchantMat_Normal.png new file mode 100644 index 0000000..cab8fe7 --- /dev/null +++ b/Characters/Merchant_low_MerchantMat_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b1551cecff0bd6c10a4d31ed58cfb2a729507de4d14306c730076f081aa3ecd +size 2230676 diff --git a/Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png b/Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..3a1398c --- /dev/null +++ b/Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9798fb96e69788e04e39f8ade8b3066da9760508cf10540d2088e12bc40bd5a8 +size 1990806 diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index b792816..f3f6b2f 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -128,3 +128,15 @@ CompressionQualityModifier=1.000000 AutoStreamingThreshold=0.000000 SoundCueCookQualityIndex=-1 +[/Script/GameplayDebugger.GameplayDebuggerConfig] +CategorySlot1=One +CategorySlot2=Two +CategorySlot3=Three +CategorySlot4=Four +CategorySlot5=Five +CategorySlot6=Six +CategorySlot7=Seven +CategorySlot8=Eight +CategorySlot9=Nine +CategorySlot0=Zero + diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index a87dbd8..8698439 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -82,6 +82,7 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) +ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E) +ActionMappings=(ActionName="RightClick",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) ++ActionMappings=(ActionName="Sneak",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftControl) +AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY) +AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY) +AxisMappings=(AxisName="Move Forward / Backward",Scale=1.000000,Key=Gamepad_LeftY) diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset new file mode 100644 index 0000000..0d18336 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a95745ea8a296b31278acd7e46667601fe316d9fb08c093fc88e1bb0879bb3ed +size 16844 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_001.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_001.uasset new file mode 100644 index 0000000..b0b12a1 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b86bec51a4845d75972b998fc709f5abfc4998f31b855d6702b8945b358f327 +size 17109 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_002.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_002.uasset new file mode 100644 index 0000000..c9f4532 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d3bc405b7a51d8e97edc75085210b5ba1063dc0afc444552a3a473c9f8b46db +size 17175 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_003.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_003.uasset new file mode 100644 index 0000000..df04844 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e8eff635690293d4a47eb566e1418becc16425ba3045b9427ba4486b1a73a00 +size 17318 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset new file mode 100644 index 0000000..1537265 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20a16d5d0bc9d37e73882e26d0dae584acb5eaa74246450c0d45847f9448c3bd +size 17950 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_005.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_005.uasset new file mode 100644 index 0000000..acd39cb --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4f56b1745ea5b597f6d183d03dc32d60f6f11b5606568fbb52cf6edd2d2a7e6 +size 16858 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_006.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_006.uasset new file mode 100644 index 0000000..10e3da7 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eece0d2a163e96c73ebb707cbe21666110e5394355c7d54e6e96776deab4946 +size 16857 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_007.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_007.uasset new file mode 100644 index 0000000..46fe444 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bf359823025dea250b69ae27d0ada25e066a6a31feab91895647428911421b9 +size 16860 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_008.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_008.uasset new file mode 100644 index 0000000..7d8f0f5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f06f07681273830fef43d0a07b19d8b88d38f37e9ca65b5c1930e8717965406 +size 16857 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_009.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_009.uasset new file mode 100644 index 0000000..85ec4d7 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3700c42cc4eb65fc776391524287a6e13508d8f5651f2e02a00bc427eb2278c +size 17382 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_010.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_010.uasset new file mode 100644 index 0000000..e80eac9 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5307578a83982ee7e4cc0fe9d27a9d26de321e3203e73f326253471f185db32 +size 17384 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_011.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_011.uasset new file mode 100644 index 0000000..55be96d --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1cf1c6c455a349c90e8dd13fcd67356050e5ec47245bf37446e635890a6f2ef +size 17384 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset new file mode 100644 index 0000000..30809c5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23684996f04fe79951abfc0a5f58e629cee04195caa5f0689f3469bc92ea7f4a +size 17929 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset new file mode 100644 index 0000000..44e5947 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:522fe46835892c46b16af47dc7def4a0a6f5118ab138ca0c72f30f0d58b5c4ec +size 17855 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset new file mode 100644 index 0000000..e702f0c --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a59ce6952a7402239f87ab528632958f444d793f871c847296c8f80d9741789a +size 17782 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset new file mode 100644 index 0000000..e5dabd5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:213656211e7581df746b95506799e6552a137c060ee015e6ef4c7f41761ba9a8 +size 18015 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset new file mode 100644 index 0000000..06d81f9 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88dfe8a0823e46da02fdd2eb2416dca43c8240573f681ad82931444958634494 +size 18003 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset new file mode 100644 index 0000000..0a1dd8a --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a26e514cfc96789af8d17045d9516997fdf086b5f2dcb201558c38d6403f370f +size 17737 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset new file mode 100644 index 0000000..e2f1002 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:176484469060dc39cc2fea494005d8fa339b26a8994a6307bb68c1ecf3b0d67d +size 50195 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset new file mode 100644 index 0000000..e4b8048 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffebeb122c3dca9693784077235519f068d63f2c77f63c5d339da6861a037fc8 +size 29000 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset new file mode 100644 index 0000000..7770d8e --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c68569effbad32832803338b4e5350f16f0f972e0d7e5c0161c9ca12c3e0ece +size 21376 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset new file mode 100644 index 0000000..692dde8 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5944f85bcf6d7293dc81f1b5848700259e424af9759e38e6891d03e7fe8963c5 +size 21654 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset new file mode 100644 index 0000000..1aa1334 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34165c8230dbff470aec6fd22a429b7b535067b17a8d225fdd11fdbea8ca625e +size 24389 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset new file mode 100644 index 0000000..c94018d --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e0caeca66276cf19a8db4adc8369c109c0ee69bde920c6112f6eb43cc111a75 +size 30501 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset new file mode 100644 index 0000000..87eaa05 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45c909fde1b3f54c1308fc5fd18b786747b71b0e4fc4f98cdc5513069c5979b5 +size 40886 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset new file mode 100644 index 0000000..ccac7f5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67e42403d5c1aa4554ce6459d1b8a02924f380dd9747ab192aa052c8f60f306f +size 40798 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset new file mode 100644 index 0000000..f187917 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:540af10c95a5e64b010a1779411ec2dd05b719191a67459f7bb063731b3f0e7c +size 40762 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset new file mode 100644 index 0000000..7dc4c9f --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b0938c45e73e7250c48852337df96d991b92116ffb49fb87bc38ad7f3f41cf2 +size 40755 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset new file mode 100644 index 0000000..dd52007 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58ce742eec39558ca421a55282c5adb12e45734b2bb328913a53c98a7b814810 +size 40782 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset new file mode 100644 index 0000000..601dcd0 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ba7abc708fd690effce74f13d5b4170d26013130fbc47dbd60cdfba6e6708dc +size 40760 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset new file mode 100644 index 0000000..8f94ab7 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1d83b37fc5f73294fecb3f9d26e5d367629fb976cb6649c9ab3118a3fb6059b +size 40729 diff --git a/Content/BlueprintAI/AI/AIControllerBruh.uasset b/Content/BlueprintAI/AI/AIControllerBruh.uasset index 80d88e1..9737754 100644 --- a/Content/BlueprintAI/AI/AIControllerBruh.uasset +++ b/Content/BlueprintAI/AI/AIControllerBruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3bf037902c2aa1ed7ada853c5c16a27b948ee58bab4fec7dfc395a7003cd94c -size 97758 +oid sha256:c5fd648c575abc38b53e4d6f99f64a879b19c0672c2fa6a97e77cea008fad1dd +size 98856 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index b1fb7b7..c49d3cd 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:396a6ff81c0c1250e4a9251f6e9d027a09814199f3a07dc98ba8b087f35ce12b -size 72432 +oid sha256:e7b65b297ddbb306a093e271695635dfbaa96bb5a1f3c6fd0ce26ecd774a48e5 +size 71609 diff --git a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset index 708a5d3..ccfcb16 100644 --- a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d2dacba46200972bd3ed39b2e006c6f815eed957e4cb57009fd850d3565dd6f -size 99076 +oid sha256:3d9a901fca1810f64a4b9a9db9287ad7a5bc3f1567e7d778c72d94d0cf2e45ff +size 100059 diff --git a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset index 138ec00..984f8e0 100644 --- a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6077e113d99db0e0e7e66e52dc856fe1cf0473f23377f7d00f4e9ca187069ee1 -size 111320 +oid sha256:3940f6af26ff8d95d3e97b80d27b253544786ead926e582015eb17fb8da42daf +size 111618 diff --git a/Content/Blueprints/Items/AmmoItem.uasset b/Content/Blueprints/Items/AmmoItem.uasset new file mode 100644 index 0000000..9991ade --- /dev/null +++ b/Content/Blueprints/Items/AmmoItem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d7e4e608a5183142630757d1496d08c76ac9cdcb16b039c3b2e51848ab89d9d +size 6552 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset new file mode 100644 index 0000000..fa2720b --- /dev/null +++ b/Content/Blueprints/Items/ItemsInWorld/BP_AmmoItem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:733e8e625dc0b5a4b8e64f50ccda5397cdeb71aa75470f42b44a4c2606730875 +size 31844 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset index 5e94613..b53dd84 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:32388bd47d08a69c1f782c682fdf67358fb2fdd5f9dd821ed9fc97d66a0bda70 -size 31327 +oid sha256:14abf326c7821612e3c60b5312759ae40948cadf47a909bf25201e0dfa39ea7d +size 31322 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset index 239df23..def3d97 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd57bdf81793aa6f3b76784e3be306fef5ca81c5e2fa7065a29abadd420c4e0b -size 75420 +oid sha256:ea25a76832a591caa677a97dfac6c30e410974dd3c705d8923f3eea49dd79699 +size 74712 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index 0c1f862..66e45ff 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fe126443f981aa1875e8efe299d76c4f0f570aff93f9313cc9503bb811365a5 -size 51324 +oid sha256:c2ca75bf7097c26b9d40760320303c440a1559518901fd42ca6f384fbff6ea2a +size 52542 diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset index 7eecebb..a711020 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abe53946825159c2220acd237c3cc7360478b63836d52e3cbe000876e43eb5d5 -size 63822 +oid sha256:f02d6f1b555bbb983a74a2a4534e22e262373f525b0f96234c48aa8a77c11f68 +size 64594 diff --git a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset index 8e7650a..cb3480f 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:936f77df55a4f4c1baca361f8ca9384f1af821ab6c0e8c9b016a3ede25c9f8d1 -size 63821 +oid sha256:d21c0fb7a79d5390327eb841a5f67304a2ee6b13b68f3faa0c75ed276b1bf2f5 +size 64844 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 68f202b..3667ddf 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:df9e97f92efc6e557cb50693743a5db37bb9b97703afeccf8d1452b5886931ea -size 66442 +oid sha256:f2a39b15f6e64703046d9cb9b437b04838acc10eb1f1465c94bd6d8b2c4395ed +size 55131 diff --git a/Content/Dialogue/DialogueTest.umap b/Content/Dialogue/DialogueTest.umap index f2a5797..9ce057c 100644 --- a/Content/Dialogue/DialogueTest.umap +++ b/Content/Dialogue/DialogueTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f2c0cc2d73c9fd35cf193c48ae0546bd41a9a10dedfe8c60d504fe09b55e819 -size 41343 +oid sha256:10874d3de45d0093660a3b6e12561bc69214daafe2cd3072f9574c83f6cbc5d1 +size 40398 diff --git a/Content/Dialogue/NPCTest.uasset b/Content/Dialogue/NPCTest.uasset index e33f5cc..ea42022 100644 --- a/Content/Dialogue/NPCTest.uasset +++ b/Content/Dialogue/NPCTest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d8d35e08f9a82472293b350e194a815b8e58c85084e33c6211de9f7c59a67a8 -size 47133 +oid sha256:5063f0083f2c76f077c87560989081c0c995807c84b556ecad3d464bcd30c236 +size 46832 diff --git a/Content/Images/ammoicon.uasset b/Content/Images/ammoicon.uasset new file mode 100644 index 0000000..f2ed9de --- /dev/null +++ b/Content/Images/ammoicon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c3fc688d58293f796f23824c1478b40cf0d62f868547a7f0e6bf25a471db496 +size 9826 diff --git a/Content/Levels/Hub.umap b/Content/Levels/Hub.umap index ec5a412..d087c0a 100644 --- a/Content/Levels/Hub.umap +++ b/Content/Levels/Hub.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6988da9e0a0dcd9548ca16b4e663f79e07d90e1805b363dd82d8d3c0f15057ad -size 69244 +oid sha256:be6f9443f989aac1fde2b33c5f3bd02e18cc035bdf641eea6e49ed63b1b9ae4c +size 853427 diff --git a/Content/Levels/Level_1.umap b/Content/Levels/Level_1.umap new file mode 100644 index 0000000..6c1264d --- /dev/null +++ b/Content/Levels/Level_1.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54e9e04e1be101f10e16c86b4118edb28493f0a035ba04833141245596ed5939 +size 75703 diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index ea85903..e1f4942 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:838c48c134383d4b1db178233640e11ef2c4bcd49102f53648cf621dd1dcbf8a -size 27100 +oid sha256:c5cc473e60c24da835baacec54217c1f6c675c42c29643b889f07bff057a9c95 +size 34830 diff --git a/Content/Levels/Testing/SneakMechanicTesting.umap b/Content/Levels/Testing/SneakMechanicTesting.umap new file mode 100644 index 0000000..e2cea40 --- /dev/null +++ b/Content/Levels/Testing/SneakMechanicTesting.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d44e1d44549e6cd4deb70fd46d4a804ad1ca3081b495b51f9258da3d741d6ab6 +size 36264 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index ad576cc..dbb4467 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:b9913f8136b9bf2c1f42801089b7071ad667f9467ee25d72ab588ae96d7543f2 -size 247266 +oid sha256:3ddfcf9a4f7c3b3ab626893a0d6d13cac4483f9a471bbdba97d0d00efc563dd7 +size 248803 diff --git a/Content/Levels/_GENERATED/tr258492/Boolean_227A3118.uasset b/Content/Levels/_GENERATED/tr258492/Boolean_227A3118.uasset new file mode 100644 index 0000000..9bcd7eb --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Boolean_227A3118.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95a5e23adcc7c8b5fd6d5147cf80beb11961b30ec59a9e8b312dd0048fb563ff +size 14986 diff --git a/Content/Levels/_GENERATED/tr258492/Boolean_8613293A.uasset b/Content/Levels/_GENERATED/tr258492/Boolean_8613293A.uasset new file mode 100644 index 0000000..4cd3803 --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Boolean_8613293A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b2e60c2b086ec4aae6cbf239e722603883432dfd3b2f077d2f73a5af1070231 +size 13480 diff --git a/Content/Levels/_GENERATED/tr258492/Box_0AF9695A.uasset b/Content/Levels/_GENERATED/tr258492/Box_0AF9695A.uasset new file mode 100644 index 0000000..be96908 --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Box_0AF9695A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0c0c9e32613c3957933db8d898f3e73d6f3798ebc8a3d3f8500986282bc6726 +size 13499 diff --git a/Content/Levels/_GENERATED/tr258492/Box_481BA8EA.uasset b/Content/Levels/_GENERATED/tr258492/Box_481BA8EA.uasset new file mode 100644 index 0000000..123e9fc --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Box_481BA8EA.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fef6cdb331ab103ff5eaf4168b2f092dc74e9ea2de53c5a13a2f43feefc2698 +size 13505 diff --git a/Content/Levels/_GENERATED/tr258492/Box_57F24318.uasset b/Content/Levels/_GENERATED/tr258492/Box_57F24318.uasset new file mode 100644 index 0000000..3eab495 --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Box_57F24318.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52471fa2b49c5603f2122fc56b2cabc528079f8b62901b75376cfc073512f3dc +size 13505 diff --git a/Content/Levels/_GENERATED/tr258492/Box_F1F2469E.uasset b/Content/Levels/_GENERATED/tr258492/Box_F1F2469E.uasset new file mode 100644 index 0000000..7999ef6 --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Box_F1F2469E.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66a480d98451df5d2a08e53329d958deb83d151eef4a2675da08f7725bf2c312 +size 13505 diff --git a/Misc/Additional Resources/Links To Additional Resources.txt b/Misc/Additional Resources/Links To Additional Resources.txt index 51cbe97..26066be 100644 --- a/Misc/Additional Resources/Links To Additional Resources.txt +++ b/Misc/Additional Resources/Links To Additional Resources.txt @@ -1,8 +1,11 @@ -Combat Spread Sheet: -https://docs.google.com/spreadsheets/d/1s_uxjS8ir1pbt4-ofdOVpSPaQZVC8x9gQzS78bzE3KI/edit#gid=0 -https://docs.google.com/document/d/1Y6eYoKQPw9n8gl7p030fmtPjfJcE132YHAvwL7Gk4jk/edit +Combat Spread Sheet: https://docs.google.com/spreadsheets/d/1s_uxjS8ir1pbt4-ofdOVpSPaQZVC8x9gQzS78bzE3KI/edit?usp=sharing + +Combat Word Doc: https://docs.google.com/document/d/1Y6eYoKQPw9n8gl7p030fmtPjfJcE132YHAvwL7Gk4jk/edit?usp=sharing + +Enemy Spread Sheet: https://docs.google.com/spreadsheets/d/1NsmF43HhB2W9_BrQazy-rpT-GDlIZIQlLdvG18DWlkA/edit?usp=sharing + Level Blueprints - https://docs.google.com/presentation/d/1ckx8IpO-BIxTFy19MJoUy7EuAMYOYoWQE6x1E2egr1o/edit?usp=sharing diff --git a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp index a208bd0..2c808c8 100644 --- a/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp +++ b/Source/the_twilight_abyss/BaseItems/InventoryComponent.cpp @@ -40,13 +40,11 @@ bool UInventoryComponent::AddItem(class UBaseItem* BaseItem) BaseItem->StoredItems = this; BaseItem->World = GetWorld(); bool isNewItem = true; - // for every item in inventory for (auto & Item : Items) { //if the item is the same as the item that is being added if (Item->ItemDisplayName.ToString() == BaseItem->ItemDisplayName.ToString()) { - //add the amount of the item that is being added to the item in the inventory Item->StackCount++; UE_LOG(LogTemp, Display, TEXT("ITEM STACKCOUNT: %d"), Item->StackCount); isNewItem = false; diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp index 2fac2d1..40ea61b 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.cpp @@ -14,3 +14,4 @@ void UBaseItem::Use(ATempCharacter* Character) { } + diff --git a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h index 346966f..613c763 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h +++ b/Source/the_twilight_abyss/BaseItems/Items/BaseItem.h @@ -53,6 +53,9 @@ public: UPROPERTY(EditAnywhere, Category = "Item") bool isDamageBuffItem; + UPROPERTY(EditAnywhere, Category = "Item") + bool isAmmoItemType; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item") int32 StackCount = 1; @@ -69,4 +72,5 @@ public: //This is the same as the use item class but its in BP instead UFUNCTION(BlueprintImplementableEvent) void OnUse(class ATempCharacter* Character); + }; diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index ceae474..c481d7b 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -16,13 +16,12 @@ void UEatableItems::Use(ATempCharacter* Character) { if(Character) { - if(isHealingItem == true) + if(isHealingItem) { if (Character->Health < 100) { Character->Health += 10; UE_LOG(LogTemp, Display, TEXT("Healed")); - //delete itself Character->Inventory->RemoveItem(this); } else if (Character->Health >= 100) @@ -30,18 +29,27 @@ void UEatableItems::Use(ATempCharacter* Character) UE_LOG(LogTemp, Display, TEXT("Health is full")); } } - if(isDamageBuffItem == true) + + if(isDamageBuffItem) { // need to add the damage buff functionality here UE_LOG(LogTemp, Display, TEXT("Damage Buffed")); Character->Inventory->RemoveItem(this); } - } - /* - when player uses the item syrengine to debuff enemies - detect what enemie actors the player is fighting with - lower their damage by a value. - */ + if (isAmmoItemType) + { + TurnBaseCombat = GetWorld()->GetGameState(); + if (TurnBaseCombat->IronResource > 10) + { + TurnBaseCombat->IronResource += 5; + } + if (TurnBaseCombat->SulfurResource > 10) + { + TurnBaseCombat->SulfurResource += 5; + } + Character->Inventory->RemoveItem(this); + } + } } diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h index d636bcd..dadfc27 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "BaseItem.h" +#include "the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h" #include "EatableItems.generated.h" /** @@ -19,4 +20,9 @@ class THE_TWILIGHT_ABYSS_API UEatableItems : public UBaseItem protected: virtual void Use(class ATempCharacter* Character) override; + + +private: + + ATurnBaseCombatV2* TurnBaseCombat; }; diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index af4c7ba..db464e5 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -35,15 +35,15 @@ void UDialogueNPC::BeginPlay() void UDialogueNPC::NextDialogue() { //Dialogue Skip - if (CurrentDialogue.Len() < Dialogue[DialogueIndex].Len()) + if (CurrentDialogue.Len() < CurrentDialoguePath[DialogueIndex].Len()) { - CurrentDialogue = Dialogue[DialogueIndex]; + CurrentDialogue = CurrentDialoguePath[DialogueIndex]; DialogueText->SetText(FText::FromString(CurrentDialogue)); return; } DialogueIndex++; - if (DialogueIndex >= Dialogue.Num()) + if (DialogueIndex >= CurrentDialoguePath.Num()) { EndDialogue(); return; @@ -53,11 +53,11 @@ void UDialogueNPC::NextDialogue() void UDialogueNPC::NextCharacter() { - if (DialogueIndex >= Dialogue.Num()) return; + if (DialogueIndex >= CurrentDialoguePath.Num()) return; - if (CurrentDialogue.Len() < Dialogue[DialogueIndex].Len()) + if (CurrentDialogue.Len() < CurrentDialoguePath[DialogueIndex].Len()) { - CurrentDialogue.AppendChar(Dialogue[DialogueIndex][CurrentDialogue.Len()]); + CurrentDialogue.AppendChar(CurrentDialoguePath[DialogueIndex][CurrentDialogue.Len()]); DialogueText->SetText(FText::FromString(CurrentDialogue)); } } @@ -86,6 +86,7 @@ void UDialogueNPC::StartDialogue() DialogueIndex = 1; NPCNameText->SetText(FText::FromString(NPCName)); CurrentDialogue = ""; + CurrentDialoguePath = DialoguePaths[0].Dialogue; GetWorld()->GetTimerManager().SetTimer(TextAnimationTimerHandle, this, &UDialogueNPC::NextCharacter, TextAnimationSpeed, true); } @@ -105,14 +106,42 @@ void UDialogueNPC::EndDialogue() PlayerController->bShowMouseCursor = false; } -TArray UDialogueNPC::AddDialogue(FText TextInput, TArray DialogueArrayInput) +FDialoguePath UDialogueNPC::CreateRootDialoguePath() { - if (TextInput.IsEmpty()) return DialogueArrayInput; - DialogueArrayInput.Add(TextInput.ToString()); - return DialogueArrayInput; + return FDialoguePath(); +} + +FDialoguePath UDialogueNPC::CreateDialoguePath(FDialoguePath ParentDialoguePath) +{ + return FDialoguePath("#" + FString::FromInt(DialoguePaths.Num())); +} + +FDialoguePath UDialogueNPC::CreateDialogueChoice(FDialoguePath PreviousDialoguePath) +{ + return FDialoguePath(); +} + +bool UDialogueNPC::GotoDialoguePath(FString PathId) +{ + for (FDialoguePath DialogPath : DialoguePaths) + { + if (DialogPath.Dialogue[0] == PathId) + { + CurrentDialoguePath = DialogPath.Dialogue; + return true; + } + } + return false; +} + +FDialoguePath UDialogueNPC::AddDialogue(FText TextInput, FDialoguePath DialoguePath) +{ + if (TextInput.IsEmpty()) return DialoguePath; + DialoguePath.Dialogue.Add(TextInput.ToString()); + return DialoguePath; } void UDialogueNPC::GetFinalDialogue(TArray DialogueArray) { - Dialogue = DialogueArray; + DialoguePaths.Add(FDialoguePath(DialogueArray)); } diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h index eeb8276..4b6f2f9 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h @@ -16,6 +16,30 @@ enum class EChoices : uint8 Choice3 UMETA(DisplayName="Choice 3"), }; +USTRUCT(BlueprintType) +struct FDialoguePath +{ + GENERATED_BODY() + + UPROPERTY() + TArray Dialogue; + + FDialoguePath() + { + Dialogue.Add("#ROOT"); + } + + FDialoguePath(FString Id) + { + Dialogue.Add(Id); + } + + explicit FDialoguePath(TArray Dialogue) + { + this->Dialogue = Dialogue; + } +}; + UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) class THE_TWILIGHT_ABYSS_API UDialogueNPC : public UActorComponent { @@ -29,7 +53,9 @@ public: FString NPCName; UPROPERTY() - TArray Dialogue; + TArray DialoguePaths; + + TArray CurrentDialoguePath; UPROPERTY(EditAnywhere) float TextAnimationSpeed = 0.05f; @@ -75,7 +101,19 @@ public: void EndDialogue(); UFUNCTION(BlueprintPure) - TArray AddDialogue(FText TextInput, TArray DialogueArrayInput); + FDialoguePath CreateRootDialoguePath(); + + UFUNCTION() + FDialoguePath CreateDialoguePath(FDialoguePath ParentDialoguePath); + + UFUNCTION(BlueprintPure) + FDialoguePath CreateDialogueChoice(FDialoguePath PreviousDialoguePath); + + UFUNCTION() + bool GotoDialoguePath(FString PathId); + + UFUNCTION(BlueprintPure) + FDialoguePath AddDialogue(FText TextInput, FDialoguePath DialoguePath); UFUNCTION(BlueprintCallable) void GetFinalDialogue(TArray DialogueArray); diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 1062d20..3b8e8c0 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -5,7 +5,11 @@ #include "Blueprint/UserWidget.h" #include "the_twilight_abyss/BaseItems/InventoryComponent.h" #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" +#include "GameFramework/CharacterMovementComponent.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" +#include +#include "Components/SphereComponent.h" +#include "Kismet/KismetMathLibrary.h" // CONSTRUCTOR @@ -17,6 +21,8 @@ ATempCharacter::ATempCharacter() Inventory->MaxItemSlots = 10; GoldBalance = GoldBalance; Health = Health; + this->GetCharacterMovement()->GetNavAgentPropertiesRef().bCanCrouch = true; + } // Called when the game starts or when spawned @@ -25,6 +31,19 @@ void ATempCharacter::BeginPlay() Super::BeginPlay(); Health = 100; ThisCamera = Cast(this->FindComponentByClass()); + PlayerCapsule = GetCapsuleComponent(); + TArray AllActorsInScene; + + //MAKE SURE POST PROCESSING IS IN THE SCENE OR GAME WILL CRASH + UGameplayStatics::GetAllActorsOfClass(GetWorld(), APostProcessVolume::StaticClass(), AllActorsInScene); + Enemy = TEXT("Enemy"); + UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors); + //stops crashing + if (ensureMsgf(AllActorsInScene.Num() > 0, TEXT("No Post Processing Volume in scene"))) + { + PostProcessVolume = Cast(AllActorsInScene[0]); + } + Ammo = TEXT("Ammo"); } //Binds the input we made in the setup player component to the forward vector @@ -38,6 +57,32 @@ void ATempCharacter::RightMoveInput(float Axis) AddMovementInput(UKismetMathLibrary::GetRightVector(FRotator(0, GetControlRotation().Yaw, 0)) * Axis); } +void ATempCharacter::Sneak() +{ + UE_LOG(LogTemp, Display, TEXT("Sneak activated")); + if (bIsCrouched) + { + UnCrouch(); + 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 + } + } + else + { + Crouch(); + for (AActor* Actor : AIActors) + { + USphereComponent* SphereComponent = Actor->FindComponentByClass(); + if (SphereComponent != nullptr) SphereComponent->SetSphereRadius(15.0f); + } + if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.8f; + } + +} + // Called every frame void ATempCharacter::Tick(float DeltaTime) @@ -53,6 +98,9 @@ void ATempCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo PlayerInputComponent->BindAxis(TEXT("Move Right / Left"), this, &ATempCharacter::RightMoveInput); PlayerInputComponent->BindAxis(TEXT("Turn Right / Left Mouse"), this, &ATempCharacter::AddControllerYawInput); PlayerInputComponent->BindAxis(TEXT("Look Up / Down Mouse"), this, &ATempCharacter::AddControllerPitchInput); + PlayerInputComponent->BindAction(TEXT("Jump"), IE_Pressed, this, &ATempCharacter::Jump); + PlayerInputComponent->BindAction(TEXT("Sneak"), IE_Pressed, this, &ATempCharacter::Sneak); + PlayerInputComponent->BindAction(TEXT("Sneak"), IE_Released, this, &ATempCharacter::Sneak); PlayerInputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); } @@ -62,6 +110,8 @@ void ATempCharacter::KeyPressed() LineTraceLogic(); } + + // Line trace logic void ATempCharacter::LineTraceLogic() { @@ -86,7 +136,6 @@ void ATempCharacter::LineTraceLogic() } if(OutHit.GetActor()->FindComponentByClass()) { - UE_LOG(LogTemp, Display, TEXT("Hit Merchant")); auto ItemArray = OutHit.GetActor()->FindComponentByClass()->GetItem(0); if(GoldBalance >= ItemArray->ItemCostPrice) { @@ -96,7 +145,12 @@ void ATempCharacter::LineTraceLogic() } if(GoldBalance <= 0) { - UE_LOG(LogTemp, Display, TEXT("Not Enough Gold")); + return; + } + if(OutHit.GetActor()->ActorHasTag(Ammo)) + { + UE_LOG(LogTemp, Display, TEXT("Ammo destroy func activated")); + OutHit.GetActor()->Destroy(); } } // if the actor hit has the interaction component/script then it will activate the code @@ -105,7 +159,6 @@ void ATempCharacter::LineTraceLogic() { if (MyInteractable->ShopDialogWidget->IsVisible()) { - UE_LOG(LogTemp, Display, TEXT("ShopKeeper text is visible")); bShopKeeperText = true; return; } @@ -120,7 +173,6 @@ void ATempCharacter::LineTraceLogic() { DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 1.0f); MyInteractable->OnInteract(); - UE_LOG(LogTemp, Display, TEXT("OnInteract activated")); UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); // While loop to check bisDisabled var until it changes to true @@ -140,49 +192,46 @@ void ATempCharacter::LineTraceLogic() void ATempCharacter::InputDisabler() { - UE_LOG(LogTemp, Display, TEXT("Disabling playermovement")); - disableTab = true; - //GetWorld()->GetFirstPlayerController()->InputComponent->RemoveActionBinding("Interact", IE_Pressed); - GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(true); - GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(true); - GetWorld()->GetFirstPlayerController()->bShowMouseCursor = true; - GetWorld()->GetFirstPlayerController()->bEnableClickEvents = true; - GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = true; - if (ThisCamera == nullptr) + //Disable Character Movement + if (ACharacter* PlayerCharacter = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())) { - return; + PlayerCharacter->DisableInput(GetWorld()->GetFirstPlayerController()); } - else + //Set to UI Mode Only + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(FInputModeUIOnly()); + PlayerController->bShowMouseCursor = true; + + disableTab = true; + if (ThisCamera != nullptr) { OriginalCameraLocation = ThisCamera->GetComponentLocation(); OriginalCameraRotation = ThisCamera->GetComponentRotation(); OriginalCameraFOV = ThisCamera->FieldOfView; - //ulog the originalcameralocation value UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); } } void ATempCharacter::InputEnabler() { + //Enable Character Movement + if (ACharacter* PlayerCharacter = Cast(GetWorld()->GetFirstPlayerController()->GetPawn())) + { + PlayerCharacter->EnableInput(GetWorld()->GetFirstPlayerController()); + } + //Reset UI Mode + APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); + PlayerController->SetInputMode(FInputModeGameOnly()); + PlayerController->bShowMouseCursor = false; + UE_LOG(LogTemp, Display, TEXT("Enabling Inputs")); disableTab = true; - GetWorld()->GetFirstPlayerController()->SetIgnoreLookInput(false); - GetWorld()->GetFirstPlayerController()->SetIgnoreMoveInput(false); - GetWorld()->GetFirstPlayerController()->bShowMouseCursor = false; - GetWorld()->GetFirstPlayerController()->bEnableClickEvents = false; - GetWorld()->GetFirstPlayerController()->bEnableMouseOverEvents = false; - //GetWorld()->GetFirstPlayerController()->InputComponent->BindAction("Interact", IE_Pressed, this, &ATempCharacter::KeyPressed); TraceDistance = 300; - if (ThisCamera == nullptr) - { - return; - } - else + if (ThisCamera != nullptr) { ThisCamera->SetWorldLocation(OriginalCameraLocation); ThisCamera->SetWorldRotation(OriginalCameraRotation); ThisCamera->FieldOfView = OriginalCameraFOV; - //ulog the originalcameralocation value UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); } } @@ -192,7 +241,7 @@ void ATempCharacter::UseItem(class UBaseItem* Item) if(Item) { Item->Use(this); - Item->OnUse(this); //Blueprint Version + Item->OnUse(this); //OnUse is a Blueprint Version } } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 510587b..57675b2 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -6,7 +6,7 @@ #include "GameFramework/Character.h" #include "the_twilight_abyss/BaseItems/Items/BaseItem.h" #include "Camera/CameraComponent.h" -#include "Kismet/KismetMathLibrary.h" +#include "Engine/PostProcessVolume.h" #include "TempCharacter.generated.h" UCLASS() @@ -25,6 +25,12 @@ protected: void ForwardInput(float Axis); void RightMoveInput(float Axis); + UFUNCTION() + void Sneak(); + + + UCapsuleComponent* PlayerCapsule; + public: // Called every frame virtual void Tick(float DeltaTime) override; @@ -80,5 +86,13 @@ public: UPROPERTY(BlueprintReadWrite) bool disableTab = false; - + + APostProcessVolume* PostProcessVolume; + + TArray AIActors; + + FName Enemy; + + FName Ammo; + }; diff --git a/UI designs/UI book design, map and bookmark.pur b/UI designs/UI book design, map and bookmark.pur new file mode 100644 index 0000000..fb69020 Binary files /dev/null and b/UI designs/UI book design, map and bookmark.pur differ diff --git a/UI designs/book designs.psd b/UI designs/book designs.psd new file mode 100644 index 0000000..13b82d4 --- /dev/null +++ b/UI designs/book designs.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e66ac771d7f7335d346e6ecd4b6f5e9a83d78012189a9bcd2c9bebc4fafd3b7 +size 3206520 diff --git a/UI designs/final designs of book.psd b/UI designs/final designs of book.psd new file mode 100644 index 0000000..773d62a --- /dev/null +++ b/UI designs/final designs of book.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8cc262e862a2d695aaa509b7e768e4a36ea1dfd6850e68e9abcb864bd6ff32d +size 3064995 diff --git a/UI designs/game symbols designs.psd b/UI designs/game symbols designs.psd new file mode 100644 index 0000000..9618726 --- /dev/null +++ b/UI designs/game symbols designs.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d2f7796e2472e71342fdf5346d74016f820e84e9cedfa046438884586981175 +size 969178 diff --git a/UI designs/new book designs.psd b/UI designs/new book designs.psd new file mode 100644 index 0000000..599feb7 --- /dev/null +++ b/UI designs/new book designs.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22c06c817ecda9028a6e4410867cba396822ddc2ce3e20dcd51e72b535f1695e +size 3871459 diff --git a/UI designs/sketchy symbols.psd b/UI designs/sketchy symbols.psd new file mode 100644 index 0000000..83fedc4 --- /dev/null +++ b/UI designs/sketchy symbols.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d158b24535f3e0155efaf9189a059a987a5fde48ba6b4c3671697a65399ee5f +size 422048 diff --git a/UI designs/symbol for on the book.psd b/UI designs/symbol for on the book.psd new file mode 100644 index 0000000..3e4a629 --- /dev/null +++ b/UI designs/symbol for on the book.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c72b985a29734b9dc10839ded4debb90875a18189049fdf9cc481d87550f8c8e +size 839420 diff --git a/UI designs/symbols edited.psd b/UI designs/symbols edited.psd new file mode 100644 index 0000000..564b601 --- /dev/null +++ b/UI designs/symbols edited.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83cc974e2b72e040031691cb974b0f3c1149cdab3ba1c28744caf3d035872b3c +size 1852242 diff --git a/UpgradeLog.htm b/UpgradeLog.htm new file mode 100644 index 0000000..67f7ecf --- /dev/null +++ b/UpgradeLog.htm @@ -0,0 +1,277 @@ + + + + Migration Report +

+ Migration Report -

Overview

ProjectPathErrorsWarningsMessages
the_twilight_abyssIntermediate\ProjectFiles\the_twilight_abyss.vcxproj100
UE5Intermediate\ProjectFiles\UE5.vcxproj100
EngineEngine000
GamesGames000
VisualizersVisualizers000
Solutionthe_twilight_abyss.sln001

Solution and projects

\ No newline at end of file diff --git a/readme.md b/readme.md index da7878c..a31cf1b 100644 --- a/readme.md +++ b/readme.md @@ -5,3 +5,7 @@ ### Character Dialogue https://docs.google.com/spreadsheets/d/13iVCQuveBiaihpREnY145OZi5QT-1sseNoI0A5v8D1o/edit?usp=sharing + +### Bestiary lore book + +https://docs.google.com/document/d/1jvDYRwQlCNFKgY6uCOwbyIQsDW3oOkqERXwN_QHcjD8/edit?usp=sharing