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/heavy_mech.yaml b/data/mobs/examples/heavy_mech.yaml
index 669c444..afb5c2e 100644
--- a/data/mobs/examples/heavy_mech.yaml
+++ b/data/mobs/examples/heavy_mech.yaml
@@ -1,51 +1,54 @@
-name: heavy mech
-description: "A lumbering assault mech with layered armor plating and a rotary cannon arm. Steam vents from its exhaust ports with each step."
-idle_descriptions:
-  - "scans the room with a blue optical beam"
-  - "vents a cloud of steam"
-  - "rotates its cannon with a mechanical whine"
-  - "announces a threat level assessment"
-drops:
-  remains: scrap
-  loot:
-    - item_id: credits
-      weight: 55
-      quantity: 1000
-    - item_id: scrap
-      weight: 25
-      quantity: 8
-    - table: gem_table
-      weight: 10
-    - item_id: lawjunk
-      weight: 10
-      quantity: 2
 combat:
-  kind: combat
-  stats:
-    hp: 94
-    attack: 40
-    strength: 44
-    defense: 44
-    attack_type: crush
-    speed: 5
     aggressive: true
+    attack_types:
+        - crush
+    combat_descriptions:
+        - fires its rotary cannon at %s
+        - smashes %s with a hydraulic fist
+        - unleashes a missile salvo at %s
+    kind: combat
     respawn_ticks: 70
-    bonuses:
-      attack_bonus: 35
-      strength_bonus: 35
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 55
-      slash_defense: 55
-      crush_defense: 65
-      science_defense: -25
-      ranged_defense: 40
-      weakness: solar
-  size: massive
-  combat_descriptions:
-    - "fires its rotary cannon at %s"
-    - "smashes %s with a hydraulic fist"
-    - "unleashes a missile salvo at %s"
+    size: massive
+    stats:
+        attack: 40
+        bonuses:
+            attack_bonus: 35
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 35
+        defense: 44
+        defenses:
+            crush_defense: 65
+            ranged_defense: 40
+            science_defense: -25
+            slash_defense: 55
+            stab_defense: 55
+            weakness: solar
+            weakness_percent: 50
+        hp: 94
+        max_melee_hit: 8
+        speed: 5
+        strength: 44
+description: A lumbering assault mech with layered armor plating and a rotary cannon arm. Steam vents from its exhaust ports with each step.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 1000
+          weight: 55
+        - item_id: scrap
+          quantity: 8
+          weight: 25
+        - table: gem_table
+          weight: 10
+        - item_id: lawjunk
+          quantity: 2
+          weight: 10
+    remains: scrap
+idle_descriptions:
+    - scans the room with a blue optical beam
+    - vents a cloud of steam
+    - rotates its cannon with a mechanical whine
+    - announces a threat level assessment
+name: heavy mech