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/crawler.yaml b/data/mobs/examples/crawler.yaml
index 55d8f6f..53a149a 100644
--- a/data/mobs/examples/crawler.yaml
+++ b/data/mobs/examples/crawler.yaml
@@ -1,49 +1,51 @@
-name: crawler
-description: "A heavily armored bio-mechanical creature with a chitinous exoskeleton. Its regenerative biology prevents death unless dissolved with acid."
-idle_descriptions:
-  - "scrapes its mandibles together menacingly"
-  - "clicks and chitters in an alien rhythm"
-  - "tests the air with feathered antennae"
-  - "coils its segmented body defensively"
-drops:
-  remains: chitin_plate
-  loot:
-    - item_id: credits
-      weight: 70
-      quantity: 250
-    - item_id: acid_vial
-      weight: 10
-    - item_id: credits
-      weight: 20
-      quantity: 500
 combat:
-  kind: combat
-  stats:
-    hp: 80
-    attack: 25
-    strength: 22
-    defense: 30
-    attack_type: crush
-    speed: 5
     aggressive: false
+    assassin_level: 30
+    attack_types:
+        - crush
+    combat_descriptions:
+        - snaps its mandibles at %s
+        - lashes out with a barbed tail at %s
+        - charges headlong into %s
+    finishing_blow: acid_vial
+    kind: combat
     respawn_ticks: 45
-    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: 30
-  finishing_blow: acid_vial
-  size: large
-  combat_descriptions:
-    - "snaps its mandibles at %s"
-    - "lashes out with a barbed tail at %s"
-    - "charges headlong into %s"
+    size: large
+    stats:
+        attack: 25
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 30
+        defenses:
+            crush_defense: 0
+            ranged_defense: 0
+            science_defense: 0
+            slash_defense: 0
+            stab_defense: 0
+        hp: 80
+        max_melee_hit: 3
+        speed: 5
+        strength: 22
+description: A heavily armored bio-mechanical creature with a chitinous exoskeleton. Its regenerative biology prevents death unless dissolved with acid.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 250
+          weight: 70
+        - item_id: acid_vial
+          weight: 10
+        - item_id: credits
+          quantity: 500
+          weight: 20
+    remains: chitin_plate
+idle_descriptions:
+    - scrapes its mandibles together menacingly
+    - clicks and chitters in an alien rhythm
+    - tests the air with feathered antennae
+    - coils its segmented body defensively
+name: crawler