1 files changed, 30 insertions, 21 deletions
diff --git a/data/mobs/examples/enforcer_bot.yaml b/data/mobs/examples/enforcer_bot.yaml
index 78150c3..efdd698 100644
--- a/data/mobs/examples/enforcer_bot.yaml
+++ b/data/mobs/examples/enforcer_bot.yaml
@@ -1,31 +1,10 @@
 name: enforcer bot
 description: "A heavy riot control automaton with impact shields and a shock baton. It moves with deliberate, crushing steps."
-attack: 30
-strength: 35
-defense: 32
-hp: 70
-speed: 5
-aggressive: true
-respawn_ticks: 55
-attack_type: crush
-attack_bonus: 25
-strength_bonus: 25
-stab_defense: 40
-slash_defense: 40
-crush_defense: 50
-science_defense: -15
-ranged_defense: 30
-weakness: solar
 idle_descriptions:
   - "patrols the area with heavy footsteps"
   - "deploys its riot shield with a hiss"
   - "announces a warning in garbled speech"
   - "tests its shock baton against a wall"
-combat_descriptions:
-  - "smashes %s with a shock baton"
-  - "slams its riot shield into %s"
-  - "delivers a stunning blow to %s"
-size: large
 drops:
   remains: scrap
   loot:
@@ -40,3 +19,33 @@ drops:
       quantity: 800
     - table: gem_table
       weight: 5
+combat:
+  kind: combat
+  stats:
+    hp: 70
+    attack: 30
+    strength: 35
+    defense: 32
+    attack_type: crush
+    speed: 5
+    aggressive: true
+    respawn_ticks: 55
+    bonuses:
+      attack_bonus: 25
+      strength_bonus: 25
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 40
+      slash_defense: 40
+      crush_defense: 50
+      science_defense: -15
+      ranged_defense: 30
+      weakness: solar
+  size: large
+  combat_descriptions:
+    - "smashes %s with a shock baton"
+    - "slams its riot shield into %s"
+    - "delivers a stunning blow to %s"