1 files changed, 55 insertions, 53 deletions

diff --git a/data/mobs/examples/farmer.yaml b/data/mobs/examples/farmer.yaml
index 8e72ac2..a5f5e3d 100644
--- a/data/mobs/examples/farmer.yaml
+++ b/data/mobs/examples/farmer.yaml
@@ -1,56 +1,58 @@
-name: Farmer
-description: "A weathered farmer in muddy overalls, pockets bulging with seeds."
-idle_descriptions:
-  - "examines a handful of seeds"
-  - "wipes dirt from his hands"
-  - "mutters about the growing season"
-  - "adjusts his wide-brimmed hat"
-steal:
-  table: farmer_steal
-  level: 10
-  xp: 15
-  speed: 4
-drops:
-  remains: "bones"
-  loot:
-    - item_id: "potato_seed"
-      weight: 40
-      quantity: 3
-    - item_id: "onion_seed"
-      weight: 30
-      quantity: 2
-    - item_id: "cabbage_seed"
-      weight: 20
-      quantity: 2
-    - item_id: "tomato_seed"
-      weight: 10
-      quantity: 1
 combat:
-  kind: combat
-  stats:
-    hp: 15
-    attack: 3
-    strength: 3
-    defense: 3
-    attack_type: crush
-    speed: 5
     aggressive: false
+    attack_types:
+        - crush
+    combat_descriptions:
+        - swings a shovel at %s
+        - is getting beaten by %s
+        - grapples with %s
+    kind: combat
     respawn_ticks: 40
-    bonuses:
-      attack_bonus: 0
-      strength_bonus: 0
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 0
-      slash_defense: 0
-      crush_defense: 0
-      science_defense: 0
-      ranged_defense: 0
-  size: small
-  combat_descriptions:
-    - "swings a shovel at %s"
-    - "is getting beaten by %s"
-    - "grapples with %s"
+    size: small
+    stats:
+        attack: 3
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 3
+        defenses:
+            crush_defense: 0
+            ranged_defense: 0
+            science_defense: 0
+            slash_defense: 0
+            stab_defense: 0
+        hp: 15
+        max_melee_hit: 1
+        speed: 5
+        strength: 3
+description: A weathered farmer in muddy overalls, pockets bulging with seeds.
+drops:
+    loot:
+        - item_id: potato_seed
+          quantity: 3
+          weight: 40
+        - item_id: onion_seed
+          quantity: 2
+          weight: 30
+        - item_id: cabbage_seed
+          quantity: 2
+          weight: 20
+        - item_id: tomato_seed
+          quantity: 1
+          weight: 10
+    remains: bones
+idle_descriptions:
+    - examines a handful of seeds
+    - wipes dirt from his hands
+    - mutters about the growing season
+    - adjusts his wide-brimmed hat
+name: Farmer
+steal:
+    level: 10
+    speed: 4
+    table: farmer_steal
+    xp: 15