diff --git a/raws/spawns.json b/raws/spawns.json
index 4855c98..84e47b4 100644
--- a/raws/spawns.json
+++ b/raws/spawns.json
@@ -151,6 +151,61 @@
       ]
     }
   ],
+  "faction_table": [
+    {
+      "name": "Player",
+      "responses": {}
+    },
+    {
+      "name": "Mindless",
+      "responses": {
+        "Default": "attack"
+      }
+    },
+    {
+      "name": "Townsfolk",
+      "responses": {
+        "Default": "flee",
+        "Player": "ignore",
+        "Townsfolk": "ignore"
+      }
+    },
+    {
+      "name": "Bandits",
+      "responses": {
+        "Default": "attack",
+        "Bandits": "ignore"
+      }
+    },
+    {
+      "name": "Cave Goblins",
+      "responses": {
+        "Default": "attack",
+        "Cave Goblins": "ignore"
+      }
+    },
+    {
+      "name": "Carnivores",
+      "responses": {
+        "Default": "attack",
+        "Carnivores": "ignore"
+      }
+    },
+    {
+      "name": "Herbivores",
+      "responses": {
+        "Default": "flee",
+        "Herbivores": "ignore"
+      }
+    },
+    {
+      "name": "Hungry Rodents",
+      "responses": {
+        "Default": "attack",
+        "Hungry Rodents": "ignore"
+      }
+    }
+  ],
   "items": [
     {
       "name": "Health Potion",
@@ -524,7 +579,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "vendor",
+      "movement": "static",
       "attributes": {
         "intelligence": 13
       },
@@ -536,7 +591,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Shady Salesman",
@@ -548,14 +604,15 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "vendor",
+      "movement": "static",
       "attributes": {},
       "equipped": [
         "Cudgel",
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Patron",
@@ -567,7 +624,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "random",
       "quips": [
         "Quiet down, it's too early!",
         "Oh my, I drank too much.",
@@ -579,7 +636,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Priest",
@@ -591,14 +649,15 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "static",
       "attributes": {},
       "equipped": [
         "Cudgel",
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Parishioner",
@@ -610,7 +669,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "random",
       "quips": [
         "Great to see a new face here!",
         "I hear there's going to be a good sermon on tea",
@@ -622,7 +681,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Blacksmith",
@@ -634,14 +694,15 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "vendor",
+      "movement": "static",
       "attributes": {},
       "equipped": [
         "Cudgel",
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Clothier",
@@ -653,14 +714,15 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "vendor",
+      "movement": "static",
       "attributes": {},
       "equipped": [
         "Cudgel",
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Alchemist",
@@ -672,14 +734,15 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "vendor",
+      "movement": "static",
       "attributes": {},
       "equipped": [
         "Cudgel",
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Mom",
@@ -691,7 +754,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "static",
       "quips": [
         "Hello, dear",
         "Off saving the world again?",
@@ -704,7 +767,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Peasant",
@@ -716,7 +780,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "random_waypoint",
       "quips": [
         "Why are you in my house?"
       ],
@@ -726,7 +790,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Dock Worker",
@@ -738,7 +803,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "random_waypoint",
       "quips": [
         "Lovely day, eh?",
         "Nice weather",
@@ -750,7 +815,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Fisher",
@@ -762,7 +828,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "random_waypoint",
       "quips": [
         "They're biting today!",
         "I caught something, but it wasn't a fish!",
@@ -774,7 +840,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Wannabe Pirate",
@@ -786,7 +853,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "random_waypoint",
       "quips": [
         "Arrr",
         "Grog!",
@@ -798,7 +865,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Drunk",
@@ -810,7 +878,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "bystander",
+      "movement": "random",
       "quips": [
         "Hic",
         "Need... more... booze!",
@@ -822,7 +890,8 @@
         "Cloth Tunic",
         "Cloth Pants",
         "Slippers"
-      ]
+      ],
+      "faction": "Townsfolk"
     },
     {
       "name": "Rat",
@@ -834,7 +903,7 @@
       },
       "blocks_tile": true,
       "vision_range": 8,
-      "ai": "melee",
+      "movement": "static",
       "attributes": {
         "Might": 3,
         "Fitness": 3
@@ -852,7 +921,8 @@
             "damage": "1d4"
           }
         ]
-      }
+      },
+      "faction": "Hungry Rodents"
     },
     {
       "name": "Mangy Wolf",
@@ -864,7 +934,7 @@
       },
       "blocks_tile": true,
       "vision_range": 8,
-      "ai": "carnivore",
+      "movement": "static",
       "attributes": {
         "Might": 3,
         "Fitness": 3
@@ -883,7 +953,8 @@
           }
         ]
       },
-      "loot_table": "Animal"
+      "loot_table": "Animal",
+      "faction": "Carnivores"
     },
     {
       "name": "Fox",
@@ -895,7 +966,7 @@
       },
       "blocks_tile": true,
       "vision_range": 8,
-      "ai": "carnivore",
+      "movement": "static",
       "attributes": {
         "Might": 3,
         "Fitness": 3
@@ -914,7 +985,8 @@
           }
         ]
       },
-      "loot_table": "Animal"
+      "loot_table": "Animal",
+      "faction": "Carnivores"
     },
     {
       "name": "Deer",
@@ -926,7 +998,7 @@
       },
       "blocks_tile": true,
       "vision_range": 8,
-      "ai": "herbivore",
+      "movement": "random",
       "attributes": {
         "Might": 3,
         "Fitness": 3
@@ -945,7 +1017,8 @@
           }
         ]
       },
-      "loot_table": "Animal"
+      "loot_table": "Animal",
+      "faction": "Herbivores"
     },
     {
       "name": "Bandit",
@@ -957,7 +1030,7 @@
       },
       "blocks_tile": true,
       "vision_range": 6,
-      "ai": "melee",
+      "movement": "random_waypoint",
       "quips": [
         "Stand and deliver!",
         "Alright, hand it over"
@@ -972,7 +1045,8 @@
       "light": {
         "range": 6,
         "color": "#FFFF55"
-      }
+      },
+      "faction": "Bandits"
     },
     {
       "name": "Orc",
@@ -984,8 +1058,9 @@
       },
       "blocks_tile": true,
       "vision_range": 8,
-      "ai": "melee",
-      "attributes": {}
+      "movement": "static",
+      "attributes": {},
+      "faction": "Cave Goblins"
     },
     {
       "name": "Goblin",
@@ -997,8 +1072,9 @@
       },
       "blocks_tile": true,
       "vision_range": 8,
-      "ai": "melee",
-      "attributes": {}
+      "movement": "static",
+      "attributes": {},
+      "faction": "Cave Goblins"
     },
     {
       "name": "Kobold",
@@ -1010,8 +1086,9 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "melee",
-      "attributes": {}
+      "movement": "static",
+      "attributes": {},
+      "faction": "Cave Goblins"
     },
     {
       "name": "Bat",
@@ -1023,7 +1100,7 @@
       },
       "blocks_tile": true,
       "vision_range": 6,
-      "ai": "herbivore",
+      "movement": "random",
       "attributes": {
         "Might": 3,
         "Fitness": 3
@@ -1041,7 +1118,8 @@
             "damage": "1d4"
           }
         ]
-      }
+      },
+      "faction": "Herbivores"
     },
     {
       "name": "Large Spider",
@@ -1055,7 +1133,7 @@
       },
       "blocks_tile": true,
       "vision_range": 6,
-      "ai": "carnivore",
+      "movement": "static",
       "natural": {
         "armor_class": 12,
         "attacks": [
@@ -1065,7 +1143,8 @@
             "damage": "1d12"
           }
         ]
-      }
+      },
+      "faction": "Carnivores"
     },
     {
       "name": "Gelatinous Cube",
@@ -1079,7 +1158,7 @@
       },
       "blocks_tile": true,
       "vision_range": 4,
-      "ai": "carnivore",
+      "movement": "static",
       "natural": {
         "armor_class": 12,
         "attacks": [