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

1 files changed, 48 insertions, 46 deletions

diff --git a/data/mobs/examples/drone.yaml b/data/mobs/examples/drone.yaml
index 08091f5..30b1bcd 100644
--- a/data/mobs/examples/drone.yaml
+++ b/data/mobs/examples/drone.yaml
@@ -1,49 +1,51 @@
-name: drone
-description: "A malfunctioning security drone crackling with electrical discharge. Its attacks are especially dangerous to anyone not wearing insulated gloves."
-idle_descriptions:
-  - "hovers erratically, sparking"
-  - "emits a high-pitched whine"
-  - "scans the area with a flickering red beam"
-  - "rotates its weapon array with a mechanical click"
-drops:
-  remains: circuit_board
-  loot:
-    - item_id: credits
-      weight: 80
-      quantity: 75
-    - item_id: insulated_gloves
-      weight: 5
-    - item_id: credits
-      weight: 15
-      quantity: 200
 combat:
-  kind: combat
-  stats:
-    hp: 45
-    attack: 15
-    strength: 14
-    defense: 12
-    attack_type: crush
-    speed: 4
     aggressive: true
+    assassin_level: 15
+    attack_types:
+        - crush
+    combat_descriptions:
+        - fires an electrical bolt at %s
+        - charges its capacitors and zaps %s
+        - swoops down on %s with crackling energy
+    damage_without: insulated_gloves
+    kind: combat
     respawn_ticks: 35
-    bonuses:
-      attack_bonus: 0
-      strength_bonus: 0
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 0
-      slash_defense: 0
-      crush_defense: 0
-      science_defense: 0
-      ranged_defense: 0
-  assassin_level: 15
-  damage_without: insulated_gloves
-  size: small
-  combat_descriptions:
-    - "fires an electrical bolt at %s"
-    - "charges its capacitors and zaps %s"
-    - "swoops down on %s with crackling energy"
+    size: small
+    stats:
+        attack: 15
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 12
+        defenses:
+            crush_defense: 0
+            ranged_defense: 0
+            science_defense: 0
+            slash_defense: 0
+            stab_defense: 0
+        hp: 45
+        max_melee_hit: 2
+        speed: 4
+        strength: 14
+description: A malfunctioning security drone crackling with electrical discharge. Its attacks are especially dangerous to anyone not wearing insulated gloves.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 75
+          weight: 80
+        - item_id: insulated_gloves
+          weight: 5
+        - item_id: credits
+          quantity: 200
+          weight: 15
+    remains: circuit_board
+idle_descriptions:
+    - hovers erratically, sparking
+    - emits a high-pitched whine
+    - scans the area with a flickering red beam
+    - rotates its weapon array with a mechanical click
+name: drone