diff --git a/mods/_testmod/scripts/world/maps/alley3.lua b/mods/_testmod/scripts/world/maps/alley3.lua
index be4dc714f..3bb4cf342 100644
--- a/mods/_testmod/scripts/world/maps/alley3.lua
+++ b/mods/_testmod/scripts/world/maps/alley3.lua
@@ -1,30 +1,32 @@
 return {
-  version = "1.5",
+  version = "1.9",
   luaversion = "5.1",
-  tiledversion = "1.8.4",
+  tiledversion = "1.9.0",
+  class = "",
   orientation = "orthogonal",
   renderorder = "right-down",
   width = 27,
   height = 14,
   tilewidth = 40,
   tileheight = 40,
-  nextlayerid = 12,
-  nextobjectid = 100,
+  nextlayerid = 13,
+  nextobjectid = 101,
   properties = {},
   tilesets = {
     {
       name = "alley_animated",
       firstgid = 1,
-      filename = "../tilesets/alley_animated.tsx"
+      filename = "../tilesets/alley_animated.tsx",
+      exportfilename = "../tilesets/alley_animated.lua"
     },
     {
       name = "alley",
-      firstgid = 37,
+      firstgid = 34,
       filename = "../tilesets/alley.tsx"
     },
     {
       name = "city_alley",
-      firstgid = 398,
+      firstgid = 349,
       filename = "../tilesets/city_alley.tsx"
     }
   },
@@ -37,6 +39,7 @@ return {
       height = 14,
       id = 1,
       name = "Tile Layer 1",
+      class = "",
       visible = true,
       opacity = 1,
       offsetx = 0,
@@ -46,20 +49,20 @@ return {
       properties = {},
       encoding = "lua",
       data = {
-        296, 296, 296, 296, 296, 296, 296, 297, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 295, 296,
-        296, 296, 296, 296, 296, 296, 296, 297, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 295, 296,
-        296, 296, 296, 296, 296, 296, 296, 297, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 295, 296,
-        326, 326, 326, 326, 326, 326, 326, 327, 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, 295, 296,
-        326, 326, 326, 326, 326, 326, 326, 327, 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, 446, 447, 295, 296,
-        341, 341, 341, 341, 341, 341, 341, 342, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 458, 295, 296,
-        450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 458, 295, 296,
-        450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 495, 468, 468, 493, 450, 450, 450, 450, 458, 295, 296,
-        281, 281, 281, 281, 281, 281, 281, 282, 468, 481, 450, 450, 450, 450, 450, 450, 458, 122, 122, 456, 450, 450, 450, 450, 458, 295, 296,
-        296, 296, 296, 296, 296, 296, 296, 297, 122, 456, 450, 450, 450, 450, 485, 468, 469, 122, 122, 456, 450, 450, 450, 450, 458, 295, 296,
-        296, 296, 296, 296, 296, 296, 296, 297, 122, 456, 450, 450, 450, 450, 463, 446, 446, 446, 446, 449, 450, 450, 450, 450, 458, 295, 296,
-        296, 296, 296, 296, 296, 296, 296, 297, 122, 456, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 450, 458, 295, 296,
-        296, 296, 296, 296, 296, 296, 296, 297, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 295, 296,
-        296, 296, 296, 296, 296, 296, 296, 297, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 295, 296
+        293, 293, 293, 293, 293, 293, 293, 294, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 292, 293,
+        293, 293, 293, 293, 293, 293, 293, 294, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 292, 293,
+        293, 293, 293, 293, 293, 293, 293, 294, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 292, 293,
+        323, 323, 323, 323, 323, 323, 323, 324, 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, 292, 293,
+        323, 323, 323, 323, 323, 323, 323, 324, 397, 397, 397, 397, 397, 397, 397, 397, 397, 397, 397, 397, 397, 397, 397, 397, 398, 292, 293,
+        338, 338, 338, 338, 338, 338, 338, 339, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 409, 292, 293,
+        401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 409, 292, 293,
+        401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 446, 419, 419, 444, 401, 401, 401, 401, 409, 292, 293,
+        278, 278, 278, 278, 278, 278, 278, 279, 419, 432, 401, 401, 401, 401, 401, 401, 409, 119, 119, 407, 401, 401, 401, 401, 409, 292, 293,
+        293, 293, 293, 293, 293, 293, 293, 294, 119, 407, 401, 401, 401, 401, 436, 419, 420, 119, 119, 407, 401, 401, 401, 401, 409, 292, 293,
+        293, 293, 293, 293, 293, 293, 293, 294, 119, 407, 401, 401, 401, 401, 414, 397, 397, 397, 397, 400, 401, 401, 401, 401, 409, 292, 293,
+        293, 293, 293, 293, 293, 293, 293, 294, 119, 407, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 401, 409, 292, 293,
+        293, 293, 293, 293, 293, 293, 293, 294, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 292, 293,
+        293, 293, 293, 293, 293, 293, 293, 294, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 293, 292, 293
       }
     },
     {
@@ -67,6 +70,7 @@ return {
       draworder = "topdown",
       id = 4,
       name = "collision",
+      class = "",
       visible = true,
       opacity = 1,
       offsetx = 0,
@@ -78,7 +82,7 @@ return {
         {
           id = 6,
           name = "",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 0,
           y = 200,
@@ -91,7 +95,7 @@ return {
         {
           id = 7,
           name = "",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 280,
           y = 160,
@@ -104,7 +108,7 @@ return {
         {
           id = 9,
           name = "",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 320,
           y = 120,
@@ -117,7 +121,7 @@ return {
         {
           id = 10,
           name = "",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 1000,
           y = 160,
@@ -130,7 +134,7 @@ return {
         {
           id = 11,
           name = "",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 320,
           y = 480,
@@ -143,7 +147,7 @@ return {
         {
           id = 12,
           name = "",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 0,
           y = 320,
@@ -156,7 +160,7 @@ return {
         {
           id = 13,
           name = "",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 280,
           y = 360,
@@ -173,6 +177,7 @@ return {
       draworder = "topdown",
       id = 6,
       name = "blockcollision",
+      class = "",
       visible = true,
       opacity = 1,
       offsetx = 0,
@@ -184,7 +189,7 @@ return {
         {
           id = 91,
           name = "",
-          type = "",
+          class = "",
           shape = "polyline",
           x = 640,
           y = 280,
@@ -210,6 +215,7 @@ return {
       draworder = "topdown",
       id = 10,
       name = "objects_buttons",
+      class = "",
       visible = true,
       opacity = 1,
       offsetx = 0,
@@ -221,7 +227,7 @@ return {
         {
           id = 95,
           name = "tilebutton",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 680,
           y = 280,
@@ -239,7 +245,7 @@ return {
         {
           id = 96,
           name = "tilebutton",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 560,
           y = 400,
@@ -256,11 +262,53 @@ return {
         }
       }
     },
+    {
+      type = "objectgroup",
+      draworder = "topdown",
+      id = 12,
+      name = "paths",
+      class = "",
+      visible = true,
+      opacity = 1,
+      offsetx = 0,
+      offsety = 0,
+      parallaxx = 1,
+      parallaxy = 1,
+      properties = {},
+      objects = {
+        {
+          id = 100,
+          name = "star",
+          class = "",
+          shape = "polygon",
+          x = 400,
+          y = 240,
+          width = 0,
+          height = 0,
+          rotation = 0,
+          visible = true,
+          polygon = {
+            { x = 0, y = 0 },
+            { x = 80, y = 80 },
+            { x = 60, y = -40 },
+            { x = 160, y = -80 },
+            { x = 40, y = -130 },
+            { x = 0, y = -230 },
+            { x = -40, y = -130 },
+            { x = -160, y = -80 },
+            { x = -60, y = -40 },
+            { x = -80, y = 80 }
+          },
+          properties = {}
+        }
+      }
+    },
     {
       type = "objectgroup",
       draworder = "topdown",
       id = 3,
       name = "markers",
+      class = "",
       visible = true,
       opacity = 1,
       offsetx = 0,
@@ -272,7 +320,7 @@ return {
         {
           id = 2,
           name = "entry_left",
-          type = "",
+          class = "",
           shape = "point",
           x = 40,
           y = 280,
@@ -285,7 +333,7 @@ return {
         {
           id = 5,
           name = "spawn",
-          type = "",
+          class = "",
           shape = "point",
           x = 360,
           y = 280,
@@ -302,6 +350,7 @@ return {
       draworder = "topdown",
       id = 2,
       name = "objects",
+      class = "",
       visible = true,
       opacity = 1,
       offsetx = 0,
@@ -313,7 +362,7 @@ return {
         {
           id = 1,
           name = "interactable",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 360,
           y = 120,
@@ -328,7 +377,7 @@ return {
         {
           id = 4,
           name = "transition",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = -40,
           y = 240,
@@ -344,7 +393,7 @@ return {
         {
           id = 14,
           name = "forcefield",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 200,
           y = 200,
@@ -359,7 +408,7 @@ return {
         {
           id = 26,
           name = "setflag",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 360,
           y = 160,
@@ -375,7 +424,7 @@ return {
         {
           id = 27,
           name = "npc",
-          type = "",
+          class = "",
           shape = "point",
           x = 400,
           y = 240,
@@ -385,13 +434,15 @@ return {
           visible = true,
           properties = {
             ["actor"] = "starwalker",
-            ["cutscene"] = "alley3.starwalker_disable"
+            ["cutscene"] = "alley3.starwalker_disable",
+            ["path"] = "star",
+            ["speed"] = 20
           }
         },
         {
           id = 29,
           name = "setflag",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 240,
           y = 240,
@@ -407,7 +458,7 @@ return {
         {
           id = 30,
           name = "setflag",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 840,
           y = 160,
@@ -423,7 +474,7 @@ return {
         {
           id = 72,
           name = "pushblock",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 600,
           y = 360,
@@ -436,7 +487,7 @@ return {
         {
           id = 90,
           name = "pushblock",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 720,
           y = 320,
@@ -449,7 +500,7 @@ return {
         {
           id = 99,
           name = "interactable",
-          type = "",
+          class = "",
           shape = "rectangle",
           x = 360,
           y = 480,
@@ -468,6 +519,7 @@ return {
       draworder = "topdown",
       id = 5,
       name = "controllers",
+      class = "",
       visible = true,
       opacity = 1,
       offsetx = 0,
@@ -479,7 +531,7 @@ return {
         {
           id = 28,
           name = "toggle",
-          type = "",
+          class = "",
           shape = "point",
           x = 320,
           y = 240,
@@ -495,7 +547,7 @@ return {
         {
           id = 32,
           name = "toggle",
-          type = "",
+          class = "",
           shape = "point",
           x = 800,
           y = 240,
@@ -511,7 +563,7 @@ return {
         {
           id = 33,
           name = "toggle",
-          type = "",
+          class = "",
           shape = "point",
           x = 460,
           y = 180,
@@ -527,7 +579,7 @@ return {
         {
           id = 98,
           name = "toggle",
-          type = "",
+          class = "",
           shape = "point",
           x = 240,
           y = 400,
diff --git a/mods/_testmod/scripts/world/maps/alley3.tmx b/mods/_testmod/scripts/world/maps/alley3.tmx
index ed932a559..48e18b246 100644
--- a/mods/_testmod/scripts/world/maps/alley3.tmx
+++ b/mods/_testmod/scripts/world/maps/alley3.tmx
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="27" height="14" tilewidth="40" tileheight="40" infinite="0" nextlayerid="12" nextobjectid="100">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="27" height="14" tilewidth="40" tileheight="40" infinite="0" nextlayerid="13" nextobjectid="101">
  <editorsettings>
   <export target="alley3.lua" format="lua"/>
  </editorsettings>
  <tileset firstgid="1" source="../tilesets/alley_animated.tsx"/>
- <tileset firstgid="37" source="../tilesets/alley.tsx"/>
- <tileset firstgid="398" source="../tilesets/city_alley.tsx"/>
+ <tileset firstgid="34" source="../tilesets/alley.tsx"/>
+ <tileset firstgid="349" source="../tilesets/city_alley.tsx"/>
  <layer id="1" name="Tile Layer 1" width="27" height="14">
   <data encoding="csv">
-296,296,296,296,296,296,296,297,296,296,296,296,296,296,296,296,296,296,296,296,296,296,296,296,296,295,296,
-296,296,296,296,296,296,296,297,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,295,296,
-296,296,296,296,296,296,296,297,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,295,296,
-326,326,326,326,326,326,326,327,341,341,341,341,341,341,341,341,341,341,341,341,341,341,341,341,341,295,296,
-326,326,326,326,326,326,326,327,446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,447,295,296,
-341,341,341,341,341,341,341,342,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,458,295,296,
-450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,458,295,296,
-450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,495,468,468,493,450,450,450,450,458,295,296,
-281,281,281,281,281,281,281,282,468,481,450,450,450,450,450,450,458,122,122,456,450,450,450,450,458,295,296,
-296,296,296,296,296,296,296,297,122,456,450,450,450,450,485,468,469,122,122,456,450,450,450,450,458,295,296,
-296,296,296,296,296,296,296,297,122,456,450,450,450,450,463,446,446,446,446,449,450,450,450,450,458,295,296,
-296,296,296,296,296,296,296,297,122,456,450,450,450,450,450,450,450,450,450,450,450,450,450,450,458,295,296,
-296,296,296,296,296,296,296,297,281,281,281,281,281,281,281,281,281,281,281,281,281,281,281,281,281,295,296,
-296,296,296,296,296,296,296,297,296,296,296,296,296,296,296,296,296,296,296,296,296,296,296,296,296,295,296
+293,293,293,293,293,293,293,294,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,292,293,
+293,293,293,293,293,293,293,294,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,292,293,
+293,293,293,293,293,293,293,294,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,292,293,
+323,323,323,323,323,323,323,324,338,338,338,338,338,338,338,338,338,338,338,338,338,338,338,338,338,292,293,
+323,323,323,323,323,323,323,324,397,397,397,397,397,397,397,397,397,397,397,397,397,397,397,397,398,292,293,
+338,338,338,338,338,338,338,339,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,409,292,293,
+401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,409,292,293,
+401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,401,446,419,419,444,401,401,401,401,409,292,293,
+278,278,278,278,278,278,278,279,419,432,401,401,401,401,401,401,409,119,119,407,401,401,401,401,409,292,293,
+293,293,293,293,293,293,293,294,119,407,401,401,401,401,436,419,420,119,119,407,401,401,401,401,409,292,293,
+293,293,293,293,293,293,293,294,119,407,401,401,401,401,414,397,397,397,397,400,401,401,401,401,409,292,293,
+293,293,293,293,293,293,293,294,119,407,401,401,401,401,401,401,401,401,401,401,401,401,401,401,409,292,293,
+293,293,293,293,293,293,293,294,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,292,293,
+293,293,293,293,293,293,293,294,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,292,293
 </data>
  </layer>
  <objectgroup color="#0000ff" id="4" name="collision">
@@ -56,6 +56,11 @@
    </properties>
   </object>
  </objectgroup>
+ <objectgroup color="#ff0000" id="12" name="paths">
+  <object id="100" name="star" x="400" y="240">
+   <polygon points="0,0 80,80 60,-40 160,-80 40,-130 0,-230 -40,-130 -160,-80 -60,-40 -80,80"/>
+  </object>
+ </objectgroup>
  <objectgroup color="#7f00ff" id="3" name="markers">
   <object id="2" name="entry_left" x="40" y="280">
    <point/>
@@ -91,6 +96,8 @@
    <properties>
     <property name="actor" value="starwalker"/>
     <property name="cutscene" value="alley3.starwalker_disable"/>
+    <property name="path" value="star"/>
+    <property name="speed" type="int" value="20"/>
    </properties>
    <point/>
   </object>
diff --git a/src/engine/game/world/events/npc.lua b/src/engine/game/world/events/npc.lua
index d1b739fbb..f01bd5413 100644
--- a/src/engine/game/world/events/npc.lua
+++ b/src/engine/game/world/events/npc.lua
@@ -27,6 +27,12 @@
 ---@field set_flag string   *[Property `setflag`]* The name of a flag to set the value of when interacting with this object
 ---@field set_value any     *[Property `setvalue`]* The value to set the flag specified by [`set_flag`](lua://Interactable.set_flag) to (Defaults to `true`)
 ---
+---@field path          string  *[Property `path`]* The name of a path shape in the current map that the npc will follow.
+---@field speed         number  *[Property `speed`]* The speed that the npc will move along the path specified in `path`, if defined.
+---
+---@field progress      number  *[Property `progress`]* The initial progress of the npc along their path, if defined, as a decimal value between 0 and 1.
+---@field reverse_progress boolean
+---
 ---@field interact_count number The number of times this npc has been interacted with on this map load
 ---
 ---@field interact_buffer number
@@ -66,6 +72,12 @@ function NPC:init(actor, x, y, properties)
 
     self.set_flag = properties["setflag"]
     self.set_value = properties["setvalue"]
+    
+    self.path = properties["path"]
+    self.speed = properties["speed"] or 6
+
+    self.progress = (properties["progress"] or 0) % 1
+    self.reverse_progress = false
 
     self.interact_count = 0
 
@@ -130,4 +142,89 @@ function NPC:onTextEnd()
     end
 end
 
+function NPC:snapToPath()
+    if self.path and self.world.map.paths[self.path] then
+        local path = self.world.map.paths[self.path]
+
+        local progress = self.progress
+        if not path.closed then
+            progress = Ease.inOutSine(progress, 0, 1, 1)
+        end
+
+        if path.shape == "line" then
+            local dist = progress * path.length
+            local current_dist = 0
+
+            for i = 1, #path.points-1 do
+                local next_dist = Utils.dist(path.points[i].x, path.points[i].y, path.points[i+1].x, path.points[i+1].y)
+
+                if current_dist + next_dist > dist then
+                    local x = Utils.lerp(path.points[i].x, path.points[i+1].x, (dist - current_dist) / next_dist)
+                    local y = Utils.lerp(path.points[i].y, path.points[i+1].y, (dist - current_dist) / next_dist)
+
+                    if self.debug_x and self.debug_y and Kristal.DebugSystem.last_object == self then
+                        x = Utils.ease(self.debug_x, x, Kristal.DebugSystem.release_timer, "outCubic")
+                        y = Utils.ease(self.debug_y, y, Kristal.DebugSystem.release_timer, "outCubic")
+                        if Kristal.DebugSystem.release_timer >= 1 then
+                            self.debug_x = nil
+                            self.debug_y = nil
+                        end
+                    end
+
+                    self:moveTo(x, y)
+                    break
+                else
+                    current_dist = current_dist + next_dist
+                end
+            end
+        elseif path.shape == "ellipse" then
+            local angle = progress * (math.pi*2)
+            local x = path.x + math.cos(angle) * path.rx
+            local y = path.y + math.sin(angle) * path.ry
+
+            if self.debug_x and self.debug_y and Kristal.DebugSystem.last_object == self then
+                x = Utils.ease(self.debug_x, x, Kristal.DebugSystem.release_timer, "outCubic")
+                y = Utils.ease(self.debug_y, y, Kristal.DebugSystem.release_timer, "outCubic")
+                if Kristal.DebugSystem.release_timer >= 1 then
+                    self.debug_x = nil
+                    self.debug_y = nil
+                end
+            end
+
+            self:moveTo(x, y)
+        end
+    end
+end
+
+function NPC:isActive()
+    return not self.world.encountering_enemy and
+           not self.world:hasCutscene() and
+           self.world.state ~= "MENU" and
+           Game.state == "OVERWORLD"
+end
+
+function NPC:update()
+    if self:isActive() then
+        if self.path and self.world.map.paths[self.path] then
+            local path = self.world.map.paths[self.path]
+            
+            if self.reverse_progress then
+                self.progress = self.progress - (self.speed / path.length) * DTMULT
+            else
+                self.progress = self.progress + (self.speed / path.length) * DTMULT
+            end
+            if path.closed then
+                self.progress = self.progress % 1
+            elseif self.progress > 1 or self.progress < 0 then
+                self.progress = Utils.clamp(self.progress, 0, 1)
+                self.reverse_progress = not self.reverse_progress
+            end
+            
+            self:snapToPath()
+        end
+    end
+
+    super.update(self)
+end
+
 return NPC
\ No newline at end of file