fix: combat formulas and mob attack types (mobs switch attack styles if safespotting)

1 files changed, 51 insertions, 48 deletions

diff --git a/data/mobs/examples/enforcer_bot.yaml b/data/mobs/examples/enforcer_bot.yaml
index efdd698..7ba5ac0 100644
--- a/data/mobs/examples/enforcer_bot.yaml
+++ b/data/mobs/examples/enforcer_bot.yaml
@@ -1,51 +1,54 @@
-name: enforcer bot
-description: "A heavy riot control automaton with impact shields and a shock baton. It moves with deliberate, crushing steps."
-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"
-drops:
-  remains: scrap
-  loot:
-    - item_id: credits
-      weight: 60
-      quantity: 350
-    - item_id: scrap
-      weight: 20
-      quantity: 5
-    - item_id: credits
-      weight: 15
-      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
+    attack_types:
+        - crush
+    combat_descriptions:
+        - smashes %s with a shock baton
+        - slams its riot shield into %s
+        - delivers a stunning blow to %s
+    kind: combat
     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"
+    size: large
+    stats:
+        attack: 30
+        bonuses:
+            attack_bonus: 25
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 25
+        defense: 32
+        defenses:
+            crush_defense: 50
+            ranged_defense: 30
+            science_defense: -15
+            slash_defense: 40
+            stab_defense: 40
+            weakness: solar
+            weakness_percent: 50
+        hp: 70
+        max_melee_hit: 6
+        speed: 5
+        strength: 35
+description: A heavy riot control automaton with impact shields and a shock baton. It moves with deliberate, crushing steps.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 350
+          weight: 60
+        - item_id: scrap
+          quantity: 5
+          weight: 20
+        - item_id: credits
+          quantity: 800
+          weight: 15
+        - table: gem_table
+          weight: 5
+    remains: scrap
+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
+name: enforcer bot