summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/img/Atlas.pngbin0 -> 55886 bytes
-rw-r--r--assets/img/Buildings/buildings.pngbin0 -> 15793 bytes
-rw-r--r--assets/img/FX/Death Explosion.pngbin0 -> 2787 bytes
-rw-r--r--assets/img/Font/Font.pngbin0 -> 992 bytes
-rw-r--r--assets/img/LICENSE.md5
-rw-r--r--assets/img/Mobs/Cactus/Cactus Back Sheet.pngbin0 -> 8292 bytes
-rw-r--r--assets/img/Mobs/Cactus/Cactus Front Sheet.pngbin0 -> 9959 bytes
-rw-r--r--assets/img/Mobs/Cactus/Cactus Side Sheet.pngbin0 -> 8111 bytes
-rw-r--r--assets/img/Mobs/Coffin/Coffin Back Sheet.pngbin0 -> 11277 bytes
-rw-r--r--assets/img/Mobs/Coffin/Coffin Front Sheet.pngbin0 -> 16684 bytes
-rw-r--r--assets/img/Mobs/Coffin/Coffin Side Sheet.pngbin0 -> 11573 bytes
-rw-r--r--assets/img/Mobs/Coyote/Coyote Back Sheet.pngbin0 -> 21078 bytes
-rw-r--r--assets/img/Mobs/Coyote/Coyote Front Sheet.pngbin0 -> 24816 bytes
-rw-r--r--assets/img/Mobs/Coyote/Coyote Side Sheet.pngbin0 -> 19234 bytes
-rw-r--r--assets/img/NPC/NPC's.pngbin0 -> 4496 bytes
-rw-r--r--assets/img/Player/Player Angle 1 Sheet.pngbin0 -> 10619 bytes
-rw-r--r--assets/img/Player/Player Angle 2 Sheet.pngbin0 -> 10339 bytes
-rw-r--r--assets/img/Player/Player Back Sheet.pngbin0 -> 10224 bytes
-rw-r--r--assets/img/Player/Player Front Sheet.pngbin0 -> 10757 bytes
-rw-r--r--assets/img/Player/Player Side Sheet.pngbin0 -> 10406 bytes
-rw-r--r--assets/img/Player/Unused Walk and Shoot.pngbin0 -> 6161 bytes
-rw-r--r--src/main.cpp3
22 files changed, 6 insertions, 2 deletions
diff --git a/assets/img/Atlas.png b/assets/img/Atlas.png
new file mode 100644
index 0000000..bf9e821
--- /dev/null
+++ b/assets/img/Atlas.png
Binary files differ
diff --git a/assets/img/Buildings/buildings.png b/assets/img/Buildings/buildings.png
new file mode 100644
index 0000000..74636ab
--- /dev/null
+++ b/assets/img/Buildings/buildings.png
Binary files differ
diff --git a/assets/img/FX/Death Explosion.png b/assets/img/FX/Death Explosion.png
new file mode 100644
index 0000000..f3c48e3
--- /dev/null
+++ b/assets/img/FX/Death Explosion.png
Binary files differ
diff --git a/assets/img/Font/Font.png b/assets/img/Font/Font.png
new file mode 100644
index 0000000..d773eb6
--- /dev/null
+++ b/assets/img/Font/Font.png
Binary files differ
diff --git a/assets/img/LICENSE.md b/assets/img/LICENSE.md
new file mode 100644
index 0000000..4421503
--- /dev/null
+++ b/assets/img/LICENSE.md
@@ -0,0 +1,5 @@
+This asset pack has been obtained from:
+<https://bakudas.itch.io/generic-oldwest-pack>
+
+It's released under CC0 license, but it deserves some credit anyway.
+
diff --git a/assets/img/Mobs/Cactus/Cactus Back Sheet.png b/assets/img/Mobs/Cactus/Cactus Back Sheet.png
new file mode 100644
index 0000000..51133a9
--- /dev/null
+++ b/assets/img/Mobs/Cactus/Cactus Back Sheet.png
Binary files differ
diff --git a/assets/img/Mobs/Cactus/Cactus Front Sheet.png b/assets/img/Mobs/Cactus/Cactus Front Sheet.png
new file mode 100644
index 0000000..0ae4018
--- /dev/null
+++ b/assets/img/Mobs/Cactus/Cactus Front Sheet.png
Binary files differ
diff --git a/assets/img/Mobs/Cactus/Cactus Side Sheet.png b/assets/img/Mobs/Cactus/Cactus Side Sheet.png
new file mode 100644
index 0000000..132a438
--- /dev/null
+++ b/assets/img/Mobs/Cactus/Cactus Side Sheet.png
Binary files differ
diff --git a/assets/img/Mobs/Coffin/Coffin Back Sheet.png b/assets/img/Mobs/Coffin/Coffin Back Sheet.png
new file mode 100644
index 0000000..beb1e0f
--- /dev/null
+++ b/assets/img/Mobs/Coffin/Coffin Back Sheet.png
Binary files differ
diff --git a/assets/img/Mobs/Coffin/Coffin Front Sheet.png b/assets/img/Mobs/Coffin/Coffin Front Sheet.png
new file mode 100644
index 0000000..5bfd0ea
--- /dev/null
+++ b/assets/img/Mobs/Coffin/Coffin Front Sheet.png
Binary files differ
diff --git a/assets/img/Mobs/Coffin/Coffin Side Sheet.png b/assets/img/Mobs/Coffin/Coffin Side Sheet.png
new file mode 100644
index 0000000..791c355
--- /dev/null
+++ b/assets/img/Mobs/Coffin/Coffin Side Sheet.png
Binary files differ
diff --git a/assets/img/Mobs/Coyote/Coyote Back Sheet.png b/assets/img/Mobs/Coyote/Coyote Back Sheet.png
new file mode 100644
index 0000000..ed995b0
--- /dev/null
+++ b/assets/img/Mobs/Coyote/Coyote Back Sheet.png
Binary files differ
diff --git a/assets/img/Mobs/Coyote/Coyote Front Sheet.png b/assets/img/Mobs/Coyote/Coyote Front Sheet.png
new file mode 100644
index 0000000..e7383df
--- /dev/null
+++ b/assets/img/Mobs/Coyote/Coyote Front Sheet.png
Binary files differ
diff --git a/assets/img/Mobs/Coyote/Coyote Side Sheet.png b/assets/img/Mobs/Coyote/Coyote Side Sheet.png
new file mode 100644
index 0000000..ea59e13
--- /dev/null
+++ b/assets/img/Mobs/Coyote/Coyote Side Sheet.png
Binary files differ
diff --git a/assets/img/NPC/NPC's.png b/assets/img/NPC/NPC's.png
new file mode 100644
index 0000000..fcd6cce
--- /dev/null
+++ b/assets/img/NPC/NPC's.png
Binary files differ
diff --git a/assets/img/Player/Player Angle 1 Sheet.png b/assets/img/Player/Player Angle 1 Sheet.png
new file mode 100644
index 0000000..a233c32
--- /dev/null
+++ b/assets/img/Player/Player Angle 1 Sheet.png
Binary files differ
diff --git a/assets/img/Player/Player Angle 2 Sheet.png b/assets/img/Player/Player Angle 2 Sheet.png
new file mode 100644
index 0000000..c561663
--- /dev/null
+++ b/assets/img/Player/Player Angle 2 Sheet.png
Binary files differ
diff --git a/assets/img/Player/Player Back Sheet.png b/assets/img/Player/Player Back Sheet.png
new file mode 100644
index 0000000..b66fff4
--- /dev/null
+++ b/assets/img/Player/Player Back Sheet.png
Binary files differ
diff --git a/assets/img/Player/Player Front Sheet.png b/assets/img/Player/Player Front Sheet.png
new file mode 100644
index 0000000..c4b3cc0
--- /dev/null
+++ b/assets/img/Player/Player Front Sheet.png
Binary files differ
diff --git a/assets/img/Player/Player Side Sheet.png b/assets/img/Player/Player Side Sheet.png
new file mode 100644
index 0000000..ba9b83b
--- /dev/null
+++ b/assets/img/Player/Player Side Sheet.png
Binary files differ
diff --git a/assets/img/Player/Unused Walk and Shoot.png b/assets/img/Player/Unused Walk and Shoot.png
new file mode 100644
index 0000000..084de94
--- /dev/null
+++ b/assets/img/Player/Unused Walk and Shoot.png
Binary files differ
diff --git a/src/main.cpp b/src/main.cpp
index c72d597..dcedb03 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,13 +33,12 @@ class Unit: Entity{
Unit(){
- spritesheet_.loadFromFile("angle1_all.png");
+ spritesheet_.loadFromFile("assets/img/Player/Player Angle 1 Sheet.png");
standing_animation = Graphics::Animation(spritesheet_, 6, 60, 44, 48, 0);
walking_animation = Graphics::Animation(spritesheet_, 8, 60, 44, 48, 1);
shooting_animation = Graphics::OneShotAnimation(spritesheet_, 6, 60, 44, 48, 2);
complaining_animation = Graphics::OneShotAnimation(spritesheet_, 1, 60, 44, 48, 3);
dying_animation = Graphics::OneShotAnimation(spritesheet_, 14, 60, 44, 48, 4);
-
position = sf::Vector2f{0,0};
speed = sf::Vector2f{0,0};
};