Merge branch 'lorealisnat:main' into main

.gitignore

@@ -46,32 +46,32 @@ SourceArt/**/*.png
 SourceArt/**/*.tga
 
 # Binary Files
-Binaries/*
+Elistria_Calling/Binaries/*
-Plugins/**/Binaries/*
+Elistria_Calling/Plugins/**/Binaries/*
 
 # Builds
-Build/*
+Elistria_Calling/Build/*
 
 # Whitelist PakBlacklist-<BuildConfiguration>.txt files
-!Build/*/
+!Elistria_Calling/Build/*/
-Build/*/**
+Elistria_Calling/Build/*/**
-!Build/*/PakBlacklist*.txt
+!Elistria_Calling/Build/*/PakBlacklist*.txt
 
 # Don't ignore icon files in Build
-!Build/**/*.ico
+!Elistria_Calling/Build/**/*.ico
 
 # Built data for maps
 *_BuiltData.uasset
 
 # Configuration files generated by the Editor
-Saved/*
+Elistria_Calling/Saved/*
 
 # Compiled source files for the engine to use
-Intermediate/*
+Elistria_Calling/Intermediate/*
-Plugins/**/Intermediate/*
+Elistria_Calling/Plugins/**/Intermediate/*
 
 # Cache files for the editor to use
-DerivedDataCache/*
+Elistria_Calling/DerivedDataCache/*
 Elistria_Calling/Saved/Crashes/
 
 Elistria_Calling/Saved/

Elistria_Calling/Config/DefaultEngine.ini

@@ -3,11 +3,16 @@ GameName=Elistria_Calling
 
 [/Script/EngineSettings.GameMapsSettings]
 EditorStartupMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap
-GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap
+LocalMapOptions=
-TransitionMap=
+TransitionMap=None
 bUseSplitscreen=True
 TwoPlayerSplitscreenLayout=Horizontal
 ThreePlayerSplitscreenLayout=FavorTop
+FourPlayerSplitscreenLayout=Grid
+bOffsetPlayerGamepadIds=False
+GameInstanceClass=/Script/Engine.GameInstance
+GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap
+ServerDefaultMap=/Engine/Maps/Entry.Entry
 GlobalDefaultGameMode=/Game/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.BP_ThirdPersonGameMode_C
 GlobalDefaultServerGameMode=None
 

Elistria_Calling/Config/DefaultGameplayTags.ini

@@ -0,0 +1,15 @@
+[/Script/GameplayTags.GameplayTagsSettings]
+ImportTagsFromConfig=True
+WarnOnInvalidTags=True
+ClearInvalidTags=False
+AllowEditorTagUnloading=True
+AllowGameTagUnloading=False
+FastReplication=False
+InvalidTagCharacters="\"\',"
++GameplayTagRedirects=(OldTagName="Faction.Test",NewTagName="Faction.NeutralTest")
+NumBitsForContainerSize=6
+NetIndexFirstBitSegment=16
++GameplayTagList=(Tag="Faction",DevComment="")
++GameplayTagList=(Tag="Faction.Cultists",DevComment="")
++GameplayTagList=(Tag="Faction.NeutralTest",DevComment="")
+

Elistria_Calling/Config/Tags/Crafting.ini

@@ -0,0 +1,12 @@
+[/Script/GameplayTags.GameplayTagsList]
+GameplayTagList=(Tag="Crafting.Workbench.Blacksmith",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Blacksmith.CraftTest",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Blacksmith.CraftTest1",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Cooking",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Cooking.CraftTest",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Stonecutting",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Stonecutting.CraftTest",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Woodworking",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Woodworking.CraftTest",DevComment="")
+GameplayTagList=(Tag="Crafting.Workbench.Woodworking.CraftTest2",DevComment="")
+

Elistria_Calling/Config/Tags/Items.ini

@@ -0,0 +1,30 @@
+[/Script/GameplayTags.GameplayTagsList]
+GameplayTagList=(Tag="Item",DevComment="")
+GameplayTagList=(Tag="Item.Consumable",DevComment="")
+GameplayTagList=(Tag="Item.Consumable.Ammo",DevComment="")
+GameplayTagList=(Tag="Item.Consumable.Ammo.Arrow",DevComment="")
+GameplayTagList=(Tag="Item.Consumable.Food",DevComment="")
+GameplayTagList=(Tag="Item.Consumable.Potion",DevComment="")
+GameplayTagList=(Tag="Item.Empty",DevComment="")
+GameplayTagList=(Tag="Item.Equipment",DevComment="")
+GameplayTagList=(Tag="Item.Equipment.Armor",DevComment="")
+GameplayTagList=(Tag="Item.Equipment.Melee",DevComment="")
+GameplayTagList=(Tag="Item.Equipment.Melee.Axe",DevComment="")
+GameplayTagList=(Tag="Item.Equipment.Melee.Pickaxe",DevComment="")
+GameplayTagList=(Tag="Item.Equipment.Melee.Sword",DevComment="")
+GameplayTagList=(Tag="Item.Equipment.Offhand",DevComment="")
+GameplayTagList=(Tag="Item.Equipment.Ranged",DevComment="")
+GameplayTagList=(Tag="Item.Equipment.Ranged.Bow",DevComment="")
+GameplayTagList=(Tag="Item.Material",DevComment="")
+GameplayTagList=(Tag="Item.Material.Metal",DevComment="")
+GameplayTagList=(Tag="Item.Material.Metal.Gold",DevComment="")
+GameplayTagList=(Tag="Item.Material.Metal.Iron",DevComment="")
+GameplayTagList=(Tag="Item.Material.Metal.Silver",DevComment="")
+GameplayTagList=(Tag="Item.Material.Metal.Steel",DevComment="")
+GameplayTagList=(Tag="Item.Material.Stone",DevComment="")
+GameplayTagList=(Tag="Item.Material.Stone.Flint",DevComment="")
+GameplayTagList=(Tag="Item.Material.Wood",DevComment="")
+GameplayTagList=(Tag="Item.Material.Wood.Aspen",DevComment="")
+GameplayTagList=(Tag="Item.Material.Wood.Maple",DevComment="")
+GameplayTagList=(Tag="Item.Material.Wood.Oak",DevComment="")
+

Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35065b89055bcc246430a3f13727275e73741cbd4fb15624b551dfb4d6cdbc02
+oid sha256:1b08a87918f47e08831794dd6d5eaacf8d98472e05a23994cb5735446b63f22e
-size 520651
+size 524140

Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4513aea0b1fd696d8b2d966dc8a3689ff2854b540d0013e52efdbbaff8923a71
+size 46380

Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b20f3fcc7b5b11ca9e57a7949cbb952b932b71c62c6a6a2b6cb7cea3d9153446
+size 278113

Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d17036f029f66f630044dcc90bce60fc5a066b05eed74894a8fdd0182559606
+size 25790

Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/BPC_Inventory.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd016c3b97296ef98f1959805de2d2acdca0acfb79dada0556deaf249cdc85ca
+size 162177

Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/DT_Recipes.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6ca5a2dd83336225800b9ea1af8b44874a9776f9fed2a13b91adb0f14e1c2f5
+size 6187

Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/SCraftingData.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94c083c7f836a45df15d919b74f78cdaef274e780720fd82e7e025bac26cf3e6
+size 7418

Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22823f152349de9623fb8236dccbd761d605cab742b5951888e4dd2a6f3cb056
+size 171154

Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_ItemSlot.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da3a9eaaa5d606e45f0b8d3efc6d91837abfeb0ea71202403b0570e97b27bd98
+size 92340

Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14bb910085eb29fb484e5c2dfb425272cac47baf458c1142b1041154aa0592a7
+oid sha256:4cbef88fb1f2337a44720d35ccf444382c68bcd5423c897406472f878adaa094
-size 212668
+size 210158

Elistria_Calling/Content/MAIN_CONTENT/UI/Fonts/NewDataTable.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:814ef490e68b49c87764661a80650b0727af0bf84ebf9811ce21a43ac0607dc6
+size 9592