diff --git a/.gitignore b/.gitignore
index da4f8bb6..67f4d7b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# Rider files
+.idea/
+global.json
+
# Visual Studio 2015 user specific files
.vs/
diff --git a/.idea/.idea.Shooter.dir/.idea/.gitignore b/.idea/.idea.Shooter.dir/.idea/.gitignore
deleted file mode 100644
index 21750f4f..00000000
--- a/.idea/.idea.Shooter.dir/.idea/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/contentModel.xml
-/projectSettingsUpdater.xml
-/modules.xml
-/.idea.Shooter.iml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/.idea.Shooter.dir/.idea/.name b/.idea/.idea.Shooter.dir/.idea/.name
deleted file mode 100644
index 71906fc2..00000000
--- a/.idea/.idea.Shooter.dir/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Shooter
\ No newline at end of file
diff --git a/.idea/.idea.Shooter.dir/.idea/encodings.xml b/.idea/.idea.Shooter.dir/.idea/encodings.xml
deleted file mode 100644
index df87cf95..00000000
--- a/.idea/.idea.Shooter.dir/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.Shooter.dir/.idea/indexLayout.xml b/.idea/.idea.Shooter.dir/.idea/indexLayout.xml
deleted file mode 100644
index 7b08163c..00000000
--- a/.idea/.idea.Shooter.dir/.idea/indexLayout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.Shooter.dir/.idea/vcs.xml b/.idea/.idea.Shooter.dir/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddf..00000000
--- a/.idea/.idea.Shooter.dir/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.Shooter/.idea/.name b/.idea/.idea.Shooter/.idea/.name
deleted file mode 100644
index 71906fc2..00000000
--- a/.idea/.idea.Shooter/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Shooter
\ No newline at end of file
diff --git a/.idea/.idea.Shooter/.idea/encodings.xml b/.idea/.idea.Shooter/.idea/encodings.xml
deleted file mode 100644
index df87cf95..00000000
--- a/.idea/.idea.Shooter/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.Shooter/.idea/indexLayout.xml b/.idea/.idea.Shooter/.idea/indexLayout.xml
deleted file mode 100644
index 7b08163c..00000000
--- a/.idea/.idea.Shooter/.idea/indexLayout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.Shooter/.idea/projectSettingsUpdater.xml b/.idea/.idea.Shooter/.idea/projectSettingsUpdater.xml
deleted file mode 100644
index 4bb9f4d2..00000000
--- a/.idea/.idea.Shooter/.idea/projectSettingsUpdater.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.Shooter/.idea/vcs.xml b/.idea/.idea.Shooter/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddf..00000000
--- a/.idea/.idea.Shooter/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.Shooter/.idea/workspace.xml b/.idea/.idea.Shooter/.idea/workspace.xml
deleted file mode 100644
index 5b48c7f8..00000000
--- a/.idea/.idea.Shooter/.idea/workspace.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
- Intermediate/ProjectFiles/Shooter.vcxproj
- Intermediate/ProjectFiles/UE5.vcxproj
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "terminal",
- "vue.rearranger.settings.migration": "true"
- },
- "keyToStringList": {
- "rider.external.source.directories": [
- "C:\\Users\\Charnet3D\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
- "C:\\Users\\Charnet3D\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
- "C:\\Users\\Charnet3D\\AppData\\Local\\Symbols\\src"
- ]
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1652897910248
-
-
- 1652897910248
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Content/_Game/Character/Animations/Jog/JogBackBlendspace.uasset b/Content/_Game/Character/Animations/Jog/JogBackBlendspace.uasset
new file mode 100644
index 00000000..20604939
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/JogBackBlendspace.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9484d784739294c71091c96053dc05680ec042b8a0148603a6c895908b44b415
+size 7341
diff --git a/Content/_Game/Character/Animations/Jog/JogBlendspace.uasset b/Content/_Game/Character/Animations/Jog/JogBlendspace.uasset
index 7e422aa1..98aae1f0 100644
--- a/Content/_Game/Character/Animations/Jog/JogBlendspace.uasset
+++ b/Content/_Game/Character/Animations/Jog/JogBlendspace.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b1879fbabb58b191b8a919580af7bf1277472498743b4401b9ed1736ff1a8e32
-size 28471
+oid sha256:ba5e20df84f4a04a9e1b32c75479f413d62f72cf881ee423ffca40f81f192582
+size 43473
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Bwd.uasset b/Content/_Game/Character/Animations/Jog/Jog_Bwd.uasset
new file mode 100644
index 00000000..3ca0bebb
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Bwd.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8dda63dabb2f5d5cc48a29a459daaa27d60e5d581b23bcb9a150e75b9da05605
+size 444222
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Bwd_Circle_Left.uasset b/Content/_Game/Character/Animations/Jog/Jog_Bwd_Circle_Left.uasset
new file mode 100644
index 00000000..38385295
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Bwd_Circle_Left.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dba94ed0a42df3ff1b8e7c84ebc3d8398eb959a64779fe30b66e9e0ae8ee0ec6
+size 503360
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Bwd_Circle_Right.uasset b/Content/_Game/Character/Animations/Jog/Jog_Bwd_Circle_Right.uasset
new file mode 100644
index 00000000..0d7ff4da
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Bwd_Circle_Right.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:267354f5347c93205ffa6d533d63b1187832c33698bba9db928209ec3d5443f5
+size 515435
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Fwd.uasset b/Content/_Game/Character/Animations/Jog/Jog_Fwd.uasset
new file mode 100644
index 00000000..e6e62381
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Fwd.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:316c6966c5ef945d7da82550196da2d3ef24c4885a4817653a13b593dbf95492
+size 400070
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Fwd_Circle_Left.uasset b/Content/_Game/Character/Animations/Jog/Jog_Fwd_Circle_Left.uasset
new file mode 100644
index 00000000..f6c69036
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Fwd_Circle_Left.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:320fb310603bfa5897affbb19a826548961e6ed4bf598d46e21811ff1067d61f
+size 407016
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Fwd_Circle_Right.uasset b/Content/_Game/Character/Animations/Jog/Jog_Fwd_Circle_Right.uasset
new file mode 100644
index 00000000..d8432d64
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Fwd_Circle_Right.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:184e8fc2d1df55b18ea2263f1e1bc945098181c1d7091006bfb2ab87876c3ff0
+size 409824
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Left.uasset b/Content/_Game/Character/Animations/Jog/Jog_Left.uasset
new file mode 100644
index 00000000..35f904cf
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Left.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:616b2e5f2e9c8ed55b7cc32598dedee769a8704ef2a76eefc2daf278a9831295
+size 512262
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Left_Circle_Left.uasset b/Content/_Game/Character/Animations/Jog/Jog_Left_Circle_Left.uasset
new file mode 100644
index 00000000..4f6c12f0
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Left_Circle_Left.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a62539b40c9807137c3645377bf2cbcb37d5c0f8d1ad8fc9a9cf557db026c7cc
+size 521901
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Left_Circle_Right.uasset b/Content/_Game/Character/Animations/Jog/Jog_Left_Circle_Right.uasset
new file mode 100644
index 00000000..bc63b05f
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Left_Circle_Right.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abb503c6cc8b7e4e1d62230acb8958dc07bc5aa05a17c58a70a50d4d197b23fc
+size 526199
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Right.uasset b/Content/_Game/Character/Animations/Jog/Jog_Right.uasset
new file mode 100644
index 00000000..7c05bacc
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Right.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc6aca50e1ad659e9c4a808596cd932a762c43b7c23e29eaf31f36c63eca7419
+size 500652
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Right_Circle_Left.uasset b/Content/_Game/Character/Animations/Jog/Jog_Right_Circle_Left.uasset
new file mode 100644
index 00000000..7120e1ce
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Right_Circle_Left.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:feb1f0c582818e4ecfec212c1c6bdf2ca41745dd2d55b9b9e13e7eded64ce108
+size 539014
diff --git a/Content/_Game/Character/Animations/Jog/Jog_Right_Circle_Right.uasset b/Content/_Game/Character/Animations/Jog/Jog_Right_Circle_Right.uasset
new file mode 100644
index 00000000..1a85b10c
--- /dev/null
+++ b/Content/_Game/Character/Animations/Jog/Jog_Right_Circle_Right.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f92bda40572a0bf5b693342868c44bda2e7bbd5d15c2aa989bd75bf47514da77
+size 543419
diff --git a/Content/_Game/Character/ShooterAnimBP.uasset b/Content/_Game/Character/ShooterAnimBP.uasset
index 8f3f307b..a290a38c 100644
--- a/Content/_Game/Character/ShooterAnimBP.uasset
+++ b/Content/_Game/Character/ShooterAnimBP.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d684906b6bcc6ab3a7fce6196a9c8d03950f58920366afa7dbf97c0f1cf50456
-size 1527690
+oid sha256:2267c48a423d46c00789e6e69e1df1396167c90894a0b1bf8a9facf41ceb51a9
+size 1724297
diff --git a/Content/_Game/Maps/DefaultMap.umap b/Content/_Game/Maps/DefaultMap.umap
index 0ad8fe93..37cfd484 100644
--- a/Content/_Game/Maps/DefaultMap.umap
+++ b/Content/_Game/Maps/DefaultMap.umap
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:83044a33d6d039f7ad3c86bc7163835e7608b949a489fb9a4fdffc4a99a31e10
+oid sha256:06b48a5d19557a1edf2cc40bb87abc5e117cd3470ca887bfe43a06d674d0a0f9
size 188133
diff --git a/Source/Shooter/Ammo.cpp b/Source/Shooter/Ammo.cpp
index 6685664e..fc390ee5 100644
--- a/Source/Shooter/Ammo.cpp
+++ b/Source/Shooter/Ammo.cpp
@@ -38,6 +38,7 @@ void AAmmo::SetItemProperties(EItemState State)
{
Super::SetItemProperties(State);
+
switch (State)
{
case EItemState::EIS_Pickup:
diff --git a/Source/Shooter/Item.h b/Source/Shooter/Item.h
index d821d542..e141b599 100644
--- a/Source/Shooter/Item.h
+++ b/Source/Shooter/Item.h
@@ -158,6 +158,10 @@ private:
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item Properties", meta = (AllowPrivateAccess = true))
int32 ItemCount;
+ /* Item rarity - determines number of stars in Pickup Widget */
+ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Rarity, meta = (AllowPrivateAccess = true))
+ EItemRarity ItemRarity;
+
/** State of the Item */
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Item Properties", meta = (AllowPrivateAccess = true))
EItemState ItemState;
@@ -271,10 +275,6 @@ private:
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = true))
bool bCharacterInventoryFull;
- /* Item rarity - determines number of stars in Pickup Widget */
- UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Rarity, meta = (AllowPrivateAccess = true))
- EItemRarity ItemRarity;
-
/* Item rarity - determines number of stars in Pickup Widget */
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Rarity, meta = (AllowPrivateAccess = true))
TArray ActiveStars;