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

1 files changed, 43 insertions, 41 deletions

diff --git a/data/mobs/examples/solar_panel_frame.yaml b/data/mobs/examples/solar_panel_frame.yaml
index 2685db0..a24e79c 100644
--- a/data/mobs/examples/solar_panel_frame.yaml
+++ b/data/mobs/examples/solar_panel_frame.yaml
@@ -1,44 +1,46 @@
-name: solar panel frame
-description: "A half-assembled photovoltaic array on a steel frame. Panels, brackets and cabling are laid out, waiting to be fitted. This is work, not a fight — fix the panels into place to complete the array."
-task:
-  verb: assemble
-  progress_noun: assembly
-  complete_message: "You bolt the final panel into place and the solar array hums to life!"
-idle_descriptions:
-  - "stands half-assembled, panels waiting to be fitted"
-  - "has loose cabling dangling from an open junction box"
-  - "catches the light on its few mounted panels"
-drops:
-  loot:
-    - item_id: credits
-      weight: 70
-      quantity: 40
-    - item_id: credits
-      weight: 25
-      quantity: 90
-    - item_id: coal
-      weight: 5
-      quantity: 1
 combat:
-  kind: task
-  stats:
-    hp: 40
-    defense: 10
-    attack_type: crush
-    speed: 5
     aggressive: false
+    attack_types:
+        - crush
+    kind: task
     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: 40
-      slash_defense: 40
-      crush_defense: 0
-      science_defense: 10
-      ranged_defense: 10
-  size: medium
+    size: medium
+    stats:
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 10
+        defenses:
+            crush_defense: 0
+            ranged_defense: 10
+            science_defense: 10
+            slash_defense: 40
+            stab_defense: 40
+        hp: 40
+        max_melee_hit: 0
+        speed: 5
+description: A half-assembled photovoltaic array on a steel frame. Panels, brackets and cabling are laid out, waiting to be fitted. This is work, not a fight — fix the panels into place to complete the array.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 40
+          weight: 70
+        - item_id: credits
+          quantity: 90
+          weight: 25
+        - item_id: coal
+          quantity: 1
+          weight: 5
+idle_descriptions:
+    - stands half-assembled, panels waiting to be fitted
+    - has loose cabling dangling from an open junction box
+    - catches the light on its few mounted panels
+name: solar panel frame
+task:
+    complete_message: You bolt the final panel into place and the solar array hums to life!
+    progress_noun: assembly
+    verb: assemble