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

1 files changed, 47 insertions, 45 deletions

diff --git a/data/mobs/examples/scrap_bot.yaml b/data/mobs/examples/scrap_bot.yaml
index 44d92aa..227033b 100644
--- a/data/mobs/examples/scrap_bot.yaml
+++ b/data/mobs/examples/scrap_bot.yaml
@@ -1,48 +1,50 @@
-name: scrap bot
-description: "A malfunctioning maintenance robot that has gone rogue. Its chassis is covered in dents and rust, and one optical sensor flickers erratically."
-idle_descriptions:
-  - "beeps erratically and twitches"
-  - "bumps into a wall and reverses"
-  - "emits a burst of static"
-  - "scans the floor with a flickering beam"
-drops:
-  remains: scrap
-  loot:
-    - item_id: credits
-      weight: 60
-      quantity: 40
-    - item_id: scrap
-      weight: 30
-      quantity: 2
-    - item_id: credits
-      weight: 10
-      quantity: 100
 combat:
-  kind: combat
-  stats:
-    hp: 30
-    attack: 15
-    strength: 15
-    defense: 14
-    attack_type: crush
-    speed: 5
     aggressive: true
+    attack_types:
+        - crush
+    combat_descriptions:
+        - rams %s with its chassis
+        - swings a broken manipulator arm at %s
+        - discharges a spark at %s
+    kind: combat
     respawn_ticks: 30
-    bonuses:
-      attack_bonus: 10
-      strength_bonus: 8
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 20
-      slash_defense: 15
-      crush_defense: 25
-      science_defense: -5
-      ranged_defense: 10
-  size: medium
-  combat_descriptions:
-    - "rams %s with its chassis"
-    - "swings a broken manipulator arm at %s"
-    - "discharges a spark at %s"
+    size: medium
+    stats:
+        attack: 15
+        bonuses:
+            attack_bonus: 10
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 8
+        defense: 14
+        defenses:
+            crush_defense: 25
+            ranged_defense: 10
+            science_defense: -5
+            slash_defense: 15
+            stab_defense: 20
+        hp: 30
+        max_melee_hit: 3
+        speed: 5
+        strength: 15
+description: A malfunctioning maintenance robot that has gone rogue. Its chassis is covered in dents and rust, and one optical sensor flickers erratically.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 40
+          weight: 60
+        - item_id: scrap
+          quantity: 2
+          weight: 30
+        - item_id: credits
+          quantity: 100
+          weight: 10
+    remains: scrap
+idle_descriptions:
+    - beeps erratically and twitches
+    - bumps into a wall and reverses
+    - emits a burst of static
+    - scans the floor with a flickering beam
+name: scrap bot