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

1 files changed, 55 insertions, 53 deletions

diff --git a/data/mobs/examples/bioengineer.yaml b/data/mobs/examples/bioengineer.yaml
index d6c9193..6a7a74a 100644
--- a/data/mobs/examples/bioengineer.yaml
+++ b/data/mobs/examples/bioengineer.yaml
@@ -1,56 +1,58 @@
-name: Bioengineer
-description: "A lab-coated scientist carrying a satchel of genetically modified seeds. Her pockets are stuffed with rare specimens."
-idle_descriptions:
-  - "scribbles notes on a clipboard"
-  - "carefully inspects a vial of green liquid"
-  - "adjusts her safety goggles"
-  - "mutters about gene splicing yields"
-steal:
-  table: bioengineer_steal
-  level: 38
-  xp: 45
-  speed: 4
-drops:
-  remains: "bones"
-  loot:
-    - item_id: "sweetcorn_seed"
-      weight: 30
-      quantity: 2
-    - item_id: "strawberry_seed"
-      weight: 25
-      quantity: 1
-    - item_id: "watermelon_seed"
-      weight: 15
-      quantity: 1
-    - item_id: "ranarr_seed"
-      weight: 5
-      quantity: 1
 combat:
-  kind: combat
-  stats:
-    hp: 25
-    attack: 6
-    strength: 4
-    defense: 5
-    attack_type: crush
-    speed: 5
     aggressive: false
+    attack_types:
+        - crush
+    combat_descriptions:
+        - jabs a syringe at %s
+        - is being overpowered by %s
+        - fights desperately against %s
+    kind: combat
     respawn_ticks: 50
-    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
-  size: small
-  combat_descriptions:
-    - "jabs a syringe at %s"
-    - "is being overpowered by %s"
-    - "fights desperately against %s"
+    size: small
+    stats:
+        attack: 6
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 5
+        defenses:
+            crush_defense: 0
+            ranged_defense: 0
+            science_defense: 0
+            slash_defense: 0
+            stab_defense: 0
+        hp: 25
+        max_melee_hit: 1
+        speed: 5
+        strength: 4
+description: A lab-coated scientist carrying a satchel of genetically modified seeds. Her pockets are stuffed with rare specimens.
+drops:
+    loot:
+        - item_id: sweetcorn_seed
+          quantity: 2
+          weight: 30
+        - item_id: strawberry_seed
+          quantity: 1
+          weight: 25
+        - item_id: watermelon_seed
+          quantity: 1
+          weight: 15
+        - item_id: ranarr_seed
+          quantity: 1
+          weight: 5
+    remains: bones
+idle_descriptions:
+    - scribbles notes on a clipboard
+    - carefully inspects a vial of green liquid
+    - adjusts her safety goggles
+    - mutters about gene splicing yields
+name: Bioengineer
+steal:
+    level: 38
+    speed: 4
+    table: bioengineer_steal
+    xp: 45