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

1 files changed, 54 insertions, 49 deletions

diff --git a/data/mobs/examples/elite_synth.yaml b/data/mobs/examples/elite_synth.yaml
index 9628572..4bf7638 100644
--- a/data/mobs/examples/elite_synth.yaml
+++ b/data/mobs/examples/elite_synth.yaml
@@ -1,52 +1,57 @@
-name: elite synth
-description: "A sleek combat android with glowing blue optics and a compact energy weapon. Its chassis is polished alloy and its movements are disturbingly fluid."
-idle_descriptions:
-  - "calibrates targeting sensors with a soft chime"
-  - "projects a holographic tactical display"
-  - "emits a binary chirp"
-  - "reconfigures its weapon array silently"
-drops:
-  remains: circuit_board
-  loot:
-    - item_id: credits
-      weight: 50
-      quantity: 1500
-    - item_id: biojunk
-      weight: 20
-      quantity: 3
-    - item_id: naturejunk
-      weight: 15
-      quantity: 3
-    - table: gem_table
-      weight: 15
 combat:
-  kind: combat
-  stats:
-    hp: 104
-    attack: 1
-    strength: 1
-    defense: 38
-    science: 65
-    attack_type: science
-    speed: 4
     aggressive: true
+    attack_types:
+        - slash
+        - science
+    combat_descriptions:
+        - unleashes a coherent energy beam at %s
+        - fires a pulse of disruptor energy at %s
+        - overloads its emitters and blasts %s
+    kind: combat
     respawn_ticks: 75
-    bonuses:
-      attack_bonus: 0
-      strength_bonus: 0
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 45
-      slash_defense: 45
-      crush_defense: 40
-      science_defense: 55
-      ranged_defense: -15
-      weakness: chaos
-  size: medium
-  combat_descriptions:
-    - "unleashes a coherent energy beam at %s"
-    - "fires a pulse of disruptor energy at %s"
-    - "overloads its emitters and blasts %s"
+    size: medium
+    stats:
+        attack: 45
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 38
+        defenses:
+            crush_defense: 40
+            ranged_defense: -15
+            science_defense: 55
+            slash_defense: 45
+            stab_defense: 45
+            weakness: chaos
+            weakness_percent: 50
+        hp: 104
+        max_melee_hit: 9
+        max_science_hit: 12
+        science: 65
+        speed: 4
+        strength: 45
+description: A sleek combat android with glowing blue optics and a compact energy weapon. Its chassis is polished alloy and its movements are disturbingly fluid.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 1500
+          weight: 50
+        - item_id: biojunk
+          quantity: 3
+          weight: 20
+        - item_id: naturejunk
+          quantity: 3
+          weight: 15
+        - table: gem_table
+          weight: 15
+    remains: circuit_board
+idle_descriptions:
+    - calibrates targeting sensors with a soft chime
+    - projects a holographic tactical display
+    - emits a binary chirp
+    - reconfigures its weapon array silently
+name: elite synth