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

1 files changed, 52 insertions, 47 deletions

diff --git a/data/mobs/examples/security_turret.yaml b/data/mobs/examples/security_turret.yaml
index 05fce67..0403474 100644
--- a/data/mobs/examples/security_turret.yaml
+++ b/data/mobs/examples/security_turret.yaml
@@ -1,50 +1,55 @@
-name: security turret
-description: "A ceiling-mounted auto-turret with twin barrels and a red targeting laser. It tracks you with mechanical precision."
-idle_descriptions:
-  - "pans the room with a targeting laser"
-  - "emits a rhythmic clicking sound"
-  - "calibrates its targeting sensors"
-  - "beeps a warning tone"
-drops:
-  remains: scrap
-  loot:
-    - item_id: credits
-      weight: 70
-      quantity: 100
-    - item_id: scrap
-      weight: 20
-      quantity: 3
-    - item_id: credits
-      weight: 10
-      quantity: 250
 combat:
-  kind: combat
-  stats:
-    hp: 44
-    attack: 1
-    strength: 1
-    defense: 16
-    ranged: 34
-    attack_type: ranged
-    speed: 5
     aggressive: true
+    attack_types:
+        - crush
+        - ranged
+    combat_descriptions:
+        - fires twin bolts at %s
+        - unleashes a burst of rounds at %s
+        - locks onto %s and opens fire
+    kind: combat
     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: 30
-      slash_defense: 20
-      crush_defense: 40
-      science_defense: -20
-      ranged_defense: 15
-      weakness: solar
-  size: small
-  combat_descriptions:
-    - "fires twin bolts at %s"
-    - "unleashes a burst of rounds at %s"
-    - "locks onto %s and opens fire"
+    size: small
+    stats:
+        attack: 20
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 16
+        defenses:
+            crush_defense: 40
+            ranged_defense: 15
+            science_defense: -20
+            slash_defense: 20
+            stab_defense: 30
+            weakness: solar
+            weakness_percent: 50
+        hp: 44
+        max_melee_hit: 3
+        max_ranged_hit: 4
+        ranged: 34
+        speed: 5
+        strength: 20
+description: A ceiling-mounted auto-turret with twin barrels and a red targeting laser. It tracks you with mechanical precision.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 100
+          weight: 70
+        - item_id: scrap
+          quantity: 3
+          weight: 20
+        - item_id: credits
+          quantity: 250
+          weight: 10
+    remains: scrap
+idle_descriptions:
+    - pans the room with a targeting laser
+    - emits a rhythmic clicking sound
+    - calibrates its targeting sensors
+    - beeps a warning tone
+name: security turret