From b145bb07d0b9b80dcdc91ebb58519351b30e07b6 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Tue, 26 Aug 2025 04:38:53 -0500
Subject: [PATCH] Implement object identifiers and player movement.

---
 .gitignore                            |   5 +-
 Notes.txt                             |  67 +++++++-
 Shep.vcxproj                          |   8 +
 Shep.vcxproj.filters                  |   6 +
 bin/assets/gfx/Shep.png               | Bin 0 -> 4994 bytes
 bin/assets/gfx/Town1.png              | Bin 0 -> 4899 bytes
 bin/assets/maps/Collision.tsx         |   4 +
 bin/assets/maps/Town1.png             | Bin 0 -> 6817 bytes
 bin/assets/maps/Town1.tmx             |  96 +++++++++++
 bin/assets/maps/collision_tileset.png | Bin 0 -> 609 bytes
 src/AnimationState.h                  |  46 ++++++
 src/GameObject.cpp                    |  20 ++-
 src/GameObject.h                      |  13 +-
 src/GameSettings.h                    |   6 +-
 src/ShepGame.cpp                      |  13 +-
 src/ShepGame.h                        |   3 +-
 src/olcUTIL_Animate2D.h               | 226 ++++++++++++++++++++++++++
 17 files changed, 495 insertions(+), 18 deletions(-)
 create mode 100644 bin/assets/gfx/Shep.png
 create mode 100644 bin/assets/gfx/Town1.png
 create mode 100644 bin/assets/maps/Collision.tsx
 create mode 100644 bin/assets/maps/Town1.png
 create mode 100644 bin/assets/maps/Town1.tmx
 create mode 100644 bin/assets/maps/collision_tileset.png
 create mode 100644 src/AnimationState.h
 create mode 100644 src/olcUTIL_Animate2D.h

diff --git a/.gitignore b/.gitignore
index 7d6d598..8582554 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,7 +73,6 @@ x86/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
 bld/
-[Bb]in/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
@@ -275,8 +274,6 @@ _pkginfo.txt
 
 # Others
 ClientBin/
-~$*
-*~
 *.dbmdl
 *.dbproj.schemaview
 *.jfm
@@ -446,3 +443,5 @@ FodyWeavers.xsd
 /CMakeFiles
 /CMakeCache.txt
 /assets/gfx/Cute RPG
+/bin/assets/gfx/Cute RPG
+/bin
diff --git a/Notes.txt b/Notes.txt
index c7efdad..4f31a1a 100644
--- a/Notes.txt
+++ b/Notes.txt
@@ -37,4 +37,69 @@ Playtesting / Tweaks / Bugfixes
 	Multiple Puzzle Variations
 
 
-Building 1: 8x6
\ No newline at end of file
+Building 1: 8x6
+
+Battle Mechanics:
+Moves have a Color. When the Shep uses a move, their border shifts
+into the color of the move they just used.
+
+If a move hits an opponent of matching color, the damage is doubled.
+
+Each move has a "Recharge time". Using the move before the recharge time
+has finished makes it deal normal damage (%-based on full charge). 
+A move that is fully recharged deals 200% damage. Moves start with 1 charge.
+
+Moves that do apply status effects only work when fully charged.
+
+
+Capturing Mechanics:
+The lower the health of the Shep being attacked, the higher the chance of capture.
+From 5% at full health to 95% at lowest health.
+
+For legendaries the capturing rate is halved.
+
+For shinies the capturing rate is halved again.
+
+Chance of a legendary encounter is 1% (1/100)
+Each area has one legendary
+Chance of a shiny encounter is 0.5% (1/200)
+
+
+
+Hint Man
+Everytime the day/night cycle shifts (every 6 minutes) the hint man will move
+to one of a few predetermined spawn locations. If the player finds them they can
+ask for a hint to solving the puzzle (after first encountering it).
+
+First hint is free
+Second hint costs 100 geometry stars (GS)
+Every hint thereafter costs 200 GS
+
+Each time you are shown a picture of the puzzle with one more slot solved.
+When you go to solve it a faint overlay with the hint so far is shown.
+
+Each shape defeated awards you with some GS. Some NPCs will ask if you want to trade Sheps.
+Once traded, you are stuck with it, but may make it easier to unlock what you need.
+
+Each locked area is comprised of multiple Shep:
+First Area: 2 Shep
+Second Area: 3 Shep (2 from second area, 1 from first)
+Third Area: 4 Shep (3 from third area, 1 from second/first)
+Final Area: 6 Shep (4 from final area, 1 from third, 1 from second/first)
+
+In the final area, you will face legendary shep (6 in a row) at really high levels.
+Take them out or capture them and proceed to the higher tiers.
+
+
+
+Damage Formula:
+PWR = Move Base Power
+ATK = Shep Attack
+MAX(PWR+PWR*(ATK*0.01)-PWR*(DEF*0.01),1)
+
+
+Tackle		20	2
+Rush		30	2
+Flash Hit	20	3	Has priority
+Scratch		20	2
+Slash		40	3
\ No newline at end of file
diff --git a/Shep.vcxproj b/Shep.vcxproj
index c5bacd4..949605f 100644
--- a/Shep.vcxproj
+++ b/Shep.vcxproj
@@ -354,6 +354,10 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     <ClCompile Include="src\util.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="src\AnimationState.h">
+      <SubType>
+      </SubType>
+    </ClInclude>
     <ClInclude Include="src\GameObject.h">
       <SubType>
       </SubType>
@@ -377,6 +381,10 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </ClInclude>
     <ClInclude Include="src\olcPGEX_MiniAudio.h" />
     <ClInclude Include="src\olcPixelGameEngine.h" />
+    <ClInclude Include="src\olcUTIL_Animate2D.h">
+      <SubType>
+      </SubType>
+    </ClInclude>
     <ClInclude Include="src\olcUTIL_Geometry2D.h" />
     <ClInclude Include="src\olcUTIL_Hardware3D.h" />
     <ClInclude Include="src\ShepGame.h">
diff --git a/Shep.vcxproj.filters b/Shep.vcxproj.filters
index a8f98ca..785863e 100644
--- a/Shep.vcxproj.filters
+++ b/Shep.vcxproj.filters
@@ -68,5 +68,11 @@
     <ClInclude Include="src\ObjectFlag.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\olcUTIL_Animate2D.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\AnimationState.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/bin/assets/gfx/Shep.png b/bin/assets/gfx/Shep.png
new file mode 100644
index 0000000000000000000000000000000000000000..397c31c33793c493e61efa9ca5ce2ce378ae8cea
GIT binary patch
literal 4994
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

literal 0
HcmV?d00001

diff --git a/bin/assets/gfx/Town1.png b/bin/assets/gfx/Town1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e972c336dd97e66c9c7bee1bff7dadca90024ddc
GIT binary patch
literal 4899
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

literal 0
HcmV?d00001

diff --git a/bin/assets/maps/Collision.tsx b/bin/assets/maps/Collision.tsx
new file mode 100644
index 0000000..7dec85d
--- /dev/null
+++ b/bin/assets/maps/Collision.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="Collision" tilewidth="16" tileheight="16" tilecount="1" columns="1">
+ <image source="collision_tileset.png" width="16" height="16"/>
+</tileset>
diff --git a/bin/assets/maps/Town1.png b/bin/assets/maps/Town1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1dfe713e67c10a7f60f5ffde1dac46e04165387
GIT binary patch
literal 6817
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

literal 0
HcmV?d00001

diff --git a/bin/assets/maps/Town1.tmx b/bin/assets/maps/Town1.tmx
new file mode 100644
index 0000000..226d90a
--- /dev/null
+++ b/bin/assets/maps/Town1.tmx
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="35" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="2">
+ <tileset firstgid="1" source="Village.tsx"/>
+ <tileset firstgid="1025" source="Collision.tsx"/>
+ <layer id="1" name="Tile Layer 1" width="35" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,33,34,34,34,34,34,34,34,34,34,34,34,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,4,34,34,34,34,34,34,5,0,0,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,69,34,34,34,34,68,66,66,66,66,66,66,69,5,0,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,69,35,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,
+0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,
+0,97,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,99,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="2" name="Decorations" width="35" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,8,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,7,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,9,0,6,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,100,66,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,65,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,65,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,289,290,290,290,290,324,322,325,290,290,290,290,290,290,290,291,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,289,290,324,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,289,290,324,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,353,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,355,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="5" name="Collision Layer" width="35" height="24" visible="0">
+  <data encoding="csv">
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,1025,1025,1025,0,0,0,0,0,0,0,0,1025,1025,0,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,1025,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,
+1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,
+0,0,0,0,0,0,0,1025,1025,1025,1025,1025,1025,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="4" name="Object Layer 1" visible="0">
+  <object id="1" type="Building" x="64" y="48" width="128" height="96">
+   <properties>
+    <property name="Building Type" propertytype="Buildings" value="building1"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/bin/assets/maps/collision_tileset.png b/bin/assets/maps/collision_tileset.png
new file mode 100644
index 0000000000000000000000000000000000000000..69dd27c8aec24ec74e8d0ca79e334fe28c6706fd
GIT binary patch
literal 609
zcmV-n0-pVeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8^J4i*)0$WWc^VnrOKibb$c+6t{Ym|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jf7n~Gbq{ROvg%&X$9QWhhy~o`<KxkH(YWB<ls%9DK
zL|n|}SH-|9f*3{^F$_t})RURTEIh~8J$!t<i}Eb*bAOJ0rC>6^Clb#w-LQx^h-Wq}
zo%23%n3W}k_?&pspbHW|a$R=$jdRIifoFz|Y<iwJOe~hVSngt0HdNwi;)tSZlrQ95
zRyc2QR;zW^z9)ZSsGzN6xK48n2`nLr6hz3Vqk<|dL}}GXF_EVIxQBn#@u$coldA$o
zjs?`9LUR1zfAG6ovlyFllR|Nz_r<n9#(}^t&}!KB_pxoaP5}QiaHVzpwI(q8NqVEB
zMUH@hZQ$a%qse=~<qk0Nq)Ue6NPe0^u?W1M(KqFR!CRnj&F!tdkJASrOI<DB00)P_
zM2WK3J>DJc?(N?*?f!lM_D^!#vlu7?00006VoOIv09gP#01=MPJVpQj010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru=?EDJ3N=Ep&MyD}02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{0022jL_t(I%VT8t|K-2T|Ns9O$N*0m8JSpQ{{R2?n2C2P
vIR?o7`<%_hKp_}4VAOz710aBr((DWX_3afMFH8=v00000NkvXXu0mjfe^Ubv

literal 0
HcmV?d00001

diff --git a/src/AnimationState.h b/src/AnimationState.h
new file mode 100644
index 0000000..6d7b5aa
--- /dev/null
+++ b/src/AnimationState.h
@@ -0,0 +1,46 @@
+#pragma region License
+/*
+License (OLC-3)
+~~~~~~~~~~~~~~~
+
+Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions or derivations of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions or derivative works in binary form must reproduce the above
+copyright notice. This list of conditions and the following	disclaimer must be
+reproduced in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS	"AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT	HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL,	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+Portions of this software are copyright © 2024 The FreeType
+Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
+All rights reserved.
+*/
+#pragma endregion
+#pragma once
+
+enum class AnimationState{
+	STAND,
+	WALK_N,
+	WALK_E,
+	WALK_S,
+	WALK_W,
+};
\ No newline at end of file
diff --git a/src/GameObject.cpp b/src/GameObject.cpp
index 97718ba..24aea3b 100644
--- a/src/GameObject.cpp
+++ b/src/GameObject.cpp
@@ -36,12 +36,12 @@ All rights reserved.
 */
 #pragma endregion
 
-
 #include "ShepGame.h"
 #include "GameObject.h"
+#include "GameSettings.h"
 
-GameObject::GameObject(const vf3d&pos,const vf3d&scale,const std::string&spriteMeshName,const MeshType&type)
-		:pos(pos),scale(scale),spriteMeshName(spriteMeshName),type(type){};
+GameObject::GameObject(const vf3d&pos,const vf3d&scale,const ObjectID&id,const std::string&spriteMeshName,const MeshType&type)
+		:pos(pos),scale(scale),id(id),spriteMeshName(spriteMeshName),type(type){};
 
 const MeshType GameObject::GetMeshType()const{
 	return type;
@@ -82,4 +82,18 @@ void GameObject::SetAutoScale(const vf2d&unitDivision){
 	const vf2d imgSize{spr.Sprite()->Size()};
 	scale.x=imgSize.x/unitDivision.x;
 	scale.z=imgSize.y/unitDivision.y;
+}
+
+void GameObject::Update(const float&fElapsedTime){
+	if(anim)ShepGame::Game().animation.UpdateState(*anim,fElapsedTime);
+	auto&game{ShepGame::Game()};
+
+	switch(id){
+		case ObjectID::PLAYER:{
+			if(game.GetKey(Key::W).bHeld){pos.z-=fElapsedTime*GameSettings::playerSpd;}
+			if(game.GetKey(Key::A).bHeld){pos.x-=fElapsedTime*GameSettings::playerSpd;}
+			if(game.GetKey(Key::S).bHeld){pos.z+=fElapsedTime*GameSettings::playerSpd;}
+			if(game.GetKey(Key::D).bHeld){pos.x+=fElapsedTime*GameSettings::playerSpd;}
+		}break;
+	}
 }
\ No newline at end of file
diff --git a/src/GameObject.h b/src/GameObject.h
index fba1741..598239c 100644
--- a/src/GameObject.h
+++ b/src/GameObject.h
@@ -38,10 +38,18 @@ All rights reserved.
 #pragma once
 
 #include "MeshType.h"
+#include "olcUTIL_Animate2D.h"
+#include "AnimationState.h"
 
 class GameObject{
 public:
-	GameObject(const vf3d&pos,const vf3d&scale,const std::string&spriteMeshName,const MeshType&type);
+	enum class ObjectID{
+		DEFAULT,
+		PLAYER,
+	};
+
+	GameObject(const vf3d&pos,const vf3d&scale,const ObjectID&id,const std::string&spriteMeshName,const MeshType&type);
+	void Update(const float&fElapsedTime);
 	const MeshType GetMeshType()const;
 	const hw3d::mesh&GetMesh()const;
 	const vf3d&GetPos()const;
@@ -51,6 +59,9 @@ public:
 private:
 	vf3d pos;
 	vf3d scale;
+	ObjectID id;
 	std::string spriteMeshName;
 	MeshType type;
+	AnimationState state;
+	std::optional<Animate2D::AnimationState>anim;
 };
\ No newline at end of file
diff --git a/src/GameSettings.h b/src/GameSettings.h
index 00c5876..d60f57d 100644
--- a/src/GameSettings.h
+++ b/src/GameSettings.h
@@ -39,6 +39,8 @@ All rights reserved.
 
 class GameSettings{
 public:
-	inline static bool LIGHTS_VISIBLE{true};
-	inline static bool DEBUG_CAMERA{true};
+	inline static constexpr bool LIGHTS_VISIBLE{true};
+	inline static constexpr bool DEBUG_CAMERA{true};
+
+	inline static constexpr float playerSpd{5.f};
 };
\ No newline at end of file
diff --git a/src/ShepGame.cpp b/src/ShepGame.cpp
index 768a3b8..850ed0b 100644
--- a/src/ShepGame.cpp
+++ b/src/ShepGame.cpp
@@ -49,7 +49,7 @@ void ShepGame::LoadSprite(const std::string&filename){
 	assets[filename].Load("assets/gfx/"+filename);
 }
 
-GameObject&ShepGame::AddGameObject(const vf3d&pos,const vf3d&scale,const std::string&spriteMeshName,const MeshType&type){
+GameObject&ShepGame::AddGameObject(const vf3d&pos,const vf3d&scale,const GameObject::ObjectID&id,const std::string&spriteMeshName,const MeshType&type){
 	switch(type){
 		case MeshType::FLOOR:
 		case MeshType::SPRITE:{
@@ -59,7 +59,7 @@ GameObject&ShepGame::AddGameObject(const vf3d&pos,const vf3d&scale,const std::st
 			if(!meshes.count(spriteMeshName.substr(0,spriteMeshName.length()-4)+".obj"))LoadObj("building1.obj");
 		}break;
 	}
-	return objects.emplace_back(pos,scale,spriteMeshName,type);
+	return objects.emplace_back(pos,scale,id,spriteMeshName,type);
 }
 
 void ShepGame::AddLight(const Light&light){
@@ -99,10 +99,8 @@ bool ShepGame::OnUserCreate(){
 
 	LoadMap("Town1.tmx");
 
-	for(int i:std::ranges::iota_view(0,3)){
-		AddGameObject({float(i),0,0},{1,2,1},"nico-Trapper_512.png",MeshType::SPRITE);
-	}
-	auto&town{AddGameObject({0,0,0},{1,1,1},"Town1.png",MeshType::FLOOR)};
+	AddGameObject({0,0,0},{1,2,1},GameObject::ObjectID::PLAYER,"nico-Trapper_512.png",MeshType::SPRITE);
+	auto&town{AddGameObject({0,0,0},{1,1,1},GameObject::ObjectID::DEFAULT,"Town1.png",MeshType::FLOOR)};
 	town.SetAutoScale({16,16});
 
 	AddLight({{4,0,10},WHITE});
@@ -135,7 +133,7 @@ void ShepGame::LoadMap(const std::string&filename){
 			for(const XMLTag&tag:zone.properties){
 				const auto&data{tag.data};
 				if(data.at("name")=="Building Type"){
-					AddGameObject({float(spawnCoords.x),0,float(spawnCoords.y)},{1,1,1},data.at("value")+".png",MeshType::OBJ);
+					AddGameObject({float(spawnCoords.x),0,float(spawnCoords.y)},{1,1,1},GameObject::ObjectID::DEFAULT,data.at("value")+".png",MeshType::OBJ);
 				}
 			}
 
@@ -218,6 +216,7 @@ bool ShepGame::OnUserUpdate(float fElapsedTime){
 	
 	for(GameObject&obj:objects){
 		Render3DModel(obj);
+		obj.Update(fElapsedTime);
 	}
 
 	if(GameSettings::LIGHTS_VISIBLE){
diff --git a/src/ShepGame.h b/src/ShepGame.h
index 8cbcd67..58b05a1 100644
--- a/src/ShepGame.h
+++ b/src/ShepGame.h
@@ -49,7 +49,7 @@ class ShepGame : public olc::PixelGameEngine
 {
 public:
 	ShepGame();
-	GameObject&AddGameObject(const vf3d&pos,const vf3d&scale,const std::string&spriteMeshName,const MeshType&type); //Auto handles resources management! You do not have to add the sprites yourself (via LoadSprite)
+	GameObject&AddGameObject(const vf3d&pos,const vf3d&scale,const GameObject::ObjectID&id,const std::string&spriteMeshName,const MeshType&type); //Auto handles resources management! You do not have to add the sprites yourself (via LoadSprite)
 	void AddLight(const Light&light);
 	const Renderable&GetSpr(const std::string&filename)const;
 	const hw3d::mesh&GetMesh(const std::string&filename)const;
@@ -57,6 +57,7 @@ public:
 	const hw3d::mesh&GetSpriteMesh()const;
 	static ShepGame&Game();
 	void LoadMap(const std::string&filename);
+	Animate2D::Animation<AnimationState>animation;
 private:
 
 	static ShepGame*game;
diff --git a/src/olcUTIL_Animate2D.h b/src/olcUTIL_Animate2D.h
new file mode 100644
index 0000000..be18a0b
--- /dev/null
+++ b/src/olcUTIL_Animate2D.h
@@ -0,0 +1,226 @@
+/*
+	OneLoneCoder - Animate2D v1.01
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Handles animated Sprites efficiently
+
+
+	License (OLC-3)
+	~~~~~~~~~~~~~~~
+
+	Copyright 2018 - 2024 OneLoneCoder.com
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions
+	are met:
+
+	1. Redistributions or derivations of source code must retain the above
+	copyright notice, this list of conditions and the following disclaimer.
+
+	2. Redistributions or derivative works in binary form must reproduce
+	the above copyright notice. This list of conditions and the following
+	disclaimer must be reproduced in the documentation and/or other
+	materials provided with the distribution.
+
+	3. Neither the name of the copyright holder nor the names of its
+	contributors may be used to endorse or promote products derived
+	from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+	HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+	Links
+	~~~~~
+	YouTube:	https://www.youtube.com/javidx9
+	Discord:	https://discord.gg/WhwHUMV
+	Twitter:	https://www.twitter.com/javidx9
+	Twitch:		https://www.twitch.tv/javidx9
+	GitHub:		https://www.github.com/onelonecoder
+	Homepage:	https://www.onelonecoder.com
+
+	Author
+	~~~~~~
+	David Barr, aka javidx9, ©OneLoneCoder 2019, 2020, 2021, 2022, 2023, 2024
+
+
+	Versions
+	~~~~~~~~
+	1.01	+PingPong Style Animation
+*/
+
+#pragma once
+
+#include "olcUTIL_Geometry2D.h"
+#include "olcPixelGameEngine.h"
+#include <unordered_map>
+
+namespace olc::utils::Animate2D
+{
+	// This class rerpresents a valid "frame" of an animation. It could be from any image source, and
+	// any location withing that image source. Once it's constructed, it's advised not to change it, as
+	// this likely indicates a usage bug.
+	//
+	// "Sourceless" frames are valid too - this is useful if you have a particular animation set, but 
+	// want to apply it to a variety of sources, for example sprite maps with common layouts.
+	class Frame
+	{
+	public:
+		inline Frame(const olc::Renderable* gfxSource, const geom2d::rect<int32_t>& rectSource = { {0,0},{0,0} })
+			: gfxImageSource(gfxSource), rectFrameSource(rectSource)
+		{
+			// If no source rectangle specified then use whole image source. Ignore in the event 
+			// that a frame is set up as source-less
+			if(gfxSource && rectFrameSource.size.x == 0)
+				rectFrameSource.size = gfxSource->Sprite()->Size();
+		}
+
+		inline const olc::Renderable* GetSourceImage() const
+		{
+			return gfxImageSource;
+		}
+
+		inline const geom2d::rect<int32_t>& GetSourceRect() const
+		{
+			return rectFrameSource;
+		}
+
+		inline const geom2d::rect<float>& GetSourceUV() const
+		{
+			return geom2d::rect<float>{vf2d{rectFrameSource.pos}/gfxImageSource->Sprite()->Size(),vf2d{rectFrameSource.size}/gfxImageSource->Sprite()->Size()};
+		}
+
+	private:
+		const olc::Renderable* gfxImageSource;
+		geom2d::rect<int32_t> rectFrameSource;
+	};
+
+	// Animation styles decide how the frames should be traversed in time
+	enum class Style : uint8_t
+	{
+		Repeat,		// Cycle through, go back to beginning
+		OneShot,	// Play once and suspend on final frame
+		PingPong,   // Traverse through forwards, then backwards
+		Reverse,    // Cycle through sequence backwards
+	};
+
+	class FrameSequence
+	{
+	public:
+		// Constructs a sequence of frames with a duration and a traversal style
+		inline FrameSequence(const float fFrameDuration = 0.1f, const Style nStyle = Style::Repeat)
+		{
+			m_fFrameDuration = fFrameDuration;
+			m_fFrameRate = 1.0f / m_fFrameDuration;
+			m_nStyle = nStyle;
+		}
+
+		// Adds a frame to this sequence
+		inline void AddFrame(const Frame& frame)
+		{
+			m_vFrames.emplace_back(frame);
+		}
+
+		// Returns a Frame Object for a given time into an animation
+		inline const Frame& GetFrame(const float fTime) const
+		{
+			return m_vFrames[ConvertTimeToFrame(fTime)];
+		}
+		
+	private:
+		Style m_nStyle;
+		std::vector<Frame> m_vFrames;
+		float m_fFrameDuration = 0.1f;
+		float m_fFrameRate = 10.0f;
+
+		inline const size_t ConvertTimeToFrame(const float fTime) const
+		{
+			switch (m_nStyle)
+			{
+			case Style::Repeat:
+				return size_t(fTime * m_fFrameRate) % m_vFrames.size();
+				break;
+			case Style::OneShot:
+				return std::clamp(size_t(fTime * m_fFrameRate), size_t(0), m_vFrames.size() - 1);
+				break;
+			case Style::PingPong:
+				{
+					// Thanks @sigonasr2 (discord)
+					size_t frame = size_t(m_fFrameRate * fTime) % (m_vFrames.size() * 2 - 1);
+					return frame >= m_vFrames.size() ? m_vFrames.size() - frame % m_vFrames.size() - 1 : frame;
+				}
+				break;
+			case Style::Reverse:
+				return (m_vFrames.size() - 1) - (size_t(fTime * m_fFrameRate) % m_vFrames.size());
+				break;
+			}
+
+			return 0;
+		}
+	};
+
+	// A Animate2D::State is a lightweight token that can be attached to things
+	// that are animated. Under normal circumstances, it is never updated manually
+	struct AnimationState
+	{
+	private:
+		size_t nIndex = 0;
+		float fTime = 0.0f;		
+		template<typename StatesEnum>
+		friend class Animation;
+	};
+
+	// Animation object holds a group of frame sequences and can mutate an AnimationState token
+	template<typename StatesEnum>
+	class Animation
+	{
+	public:
+		Animation() = default;
+		
+		// Change an animation state token to a new state
+		inline bool ChangeState(AnimationState& state, const StatesEnum& sStateName) const
+		{
+			size_t idx = m_mapStateIndices.at(sStateName);
+			if (state.nIndex != idx)
+			{
+				state.fTime = 0.0f;
+				state.nIndex = idx;
+				return true;
+			}
+
+			return false;
+		}
+
+		// Update an animation state token
+		inline void UpdateState(AnimationState& state, const float fElapsedTime) const
+		{
+			state.fTime += fElapsedTime;
+		}
+
+	public:
+		// Retrieve the frame information for a given animation state
+		inline const Frame& GetFrame(const AnimationState& state) const
+		{
+			return m_vSequences[state.nIndex].GetFrame(state.fTime);
+		}
+
+	public:
+		// Add a named Frame sequence as a state
+		inline void AddState(const StatesEnum& sStateName, const FrameSequence& sequence)
+		{
+			m_vSequences.emplace_back(sequence);
+			m_mapStateIndices[sStateName] = m_vSequences.size() - 1;
+		}
+
+	private:
+		std::vector<FrameSequence> m_vSequences;
+		std::unordered_map<StatesEnum, size_t> m_mapStateIndices;
+	};
+}
\ No newline at end of file